This is an archive of the discontinued LLVM Phabricator instance.

Differential D132736

[asan][test] Fix typo in Unit/lit.site.cfg.py.in
ClosedPublic

Authored by ro on Aug 26 2022, 6:07 AM.

Details

Reviewers
vitalybuka
Commits
rGa31426dc87ae: [asan][test] Fix typo in Unit/lit.site.cfg.py.in
Summary

I noticed that test/asan/Unit/lit.site.cfg.py.in contains two typos, using the FreeBSD forms of the LD_*LIBRARY_PATH* variables on Solaris.

Tested on amd64-pc-solaris2.11.

Diff Detail

Event Timeline

ro created this revision.Aug 26 2022, 6:07 AM
Herald added a project: Restricted Project. · View Herald TranscriptAug 26 2022, 6:07 AM
Herald added subscribers: Enna1, fedor.sergeev, krytarowski and 2 others. · View Herald Transcript
ro requested review of this revision.Aug 26 2022, 6:07 AM
Herald added a subscriber: Restricted Project. · View Herald TranscriptAug 26 2022, 6:07 AM
Harbormaster completed remote builds in B183584: Diff 455884.Aug 26 2022, 6:39 AM
vitalybuka accepted this revision.Aug 26 2022, 4:55 PM
vitalybuka added inline comments.
compiler-rt/test/asan/Unit/lit.site.cfg.py.in
19

These probably are wrong as well

This revision is now accepted and ready to land.Aug 26 2022, 4:55 PM
ro marked an inline comment as done.Aug 26 2022, 10:48 PM
ro added inline comments.
compiler-rt/test/asan/Unit/lit.site.cfg.py.in
19

No, the names are different between FreeBSD and Solaris. I copied the FreeBSD case, but only half fixed it.

Closed by commit rGa31426dc87ae: [asan][test] Fix typo in Unit/lit.site.cfg.py.in (authored by ro). · Explain WhyAug 26 2022, 10:51 PM
This revision was automatically updated to reflect the committed changes.
ro marked an inline comment as done.
ro added a commit: rGa31426dc87ae: [asan][test] Fix typo in Unit/lit.site.cfg.py.in.

Revision Contents

PathSize
compiler-rt/
test/
asan/
Unit/
4 lines

Diff 456084

compiler-rt/test/asan/Unit/lit.site.cfg.py.in

Show All 10 Lines
def push_ld_library_path(config, new_path): def push_ld_library_path(config, new_path):
new_ld_library_path = os.path.pathsep.join( new_ld_library_path = os.path.pathsep.join(
(new_path, config.environment.get('LD_LIBRARY_PATH', ''))) (new_path, config.environment.get('LD_LIBRARY_PATH', '')))
config.environment['LD_LIBRARY_PATH'] = new_ld_library_path config.environment['LD_LIBRARY_PATH'] = new_ld_library_path
if platform.system() == 'FreeBSD': if platform.system() == 'FreeBSD':
new_ld_32_library_path = os.path.pathsep.join( new_ld_32_library_path = os.path.pathsep.join(
(new_path, config.environment.get('LD_32_LIBRARY_PATH', ''))) (new_path, config.environment.get('LD_32_LIBRARY_PATH', '')))
config.environment['LD_32_LIBRARY_PATH'] = new_ld_32_library_path config.environment['LD_32_LIBRARY_PATH'] = new_ld_32_library_path
vitalybukaUnsubmitted
Done
ReplyInline Actions

These probably are wrong as well

vitalybuka: These probably are wrong as well
roAuthorUnsubmitted
Done
ReplyInline Actions

No, the names are different between FreeBSD and Solaris. I copied the FreeBSD case, but only half fixed it.

ro: No, the names **are** different between FreeBSD and Solaris. I copied the FreeBSD case, but…
if platform.system() == 'SunOS': if platform.system() == 'SunOS':
new_ld_library_path_32 = os.path.pathsep.join( new_ld_library_path_32 = os.path.pathsep.join(
(new_path, config.environment.get('LD_LIBRARY_PATH_32', ''))) (new_path, config.environment.get('LD_LIBRARY_PATH_32', '')))
config.environment['LD_32_LIBRARY_PATH'] = new_ld_library_path_32 config.environment['LD_LIBRARY_PATH_32'] = new_ld_library_path_32
new_ld_library_path_64 = os.path.pathsep.join( new_ld_library_path_64 = os.path.pathsep.join(
(new_path, config.environment.get('LD_LIBRARY_PATH_64', ''))) (new_path, config.environment.get('LD_LIBRARY_PATH_64', '')))
config.environment['LD_64_LIBRARY_PATH'] = new_ld_library_path_64 config.environment['LD_LIBRARY_PATH_64'] = new_ld_library_path_64
# Setup config name. # Setup config name.
config.name = 'AddressSanitizer-Unit' config.name = 'AddressSanitizer-Unit'
# Load target architecture information. Note config.target_triple can be # Load target architecture information. Note config.target_triple can be
# incorrect since it is populated with the default target. This unit test suite # incorrect since it is populated with the default target. This unit test suite
# may run for multiple targets. The dynamic suite needs the correct target for # may run for multiple targets. The dynamic suite needs the correct target for
# library path selection. # library path selection.
Show All 30 Lines