This is an archive of the discontinued LLVM Phabricator instance.

Differential D63761

[compiler-rt][test] Set shared_libasan_path in test/asan/lit.cfg on Solaris
ClosedPublic

Authored by ro on Jun 25 2019, 4:36 AM.

Details

Reviewers
kcc
samsonov
eugenis
Commits
rGe6474e682aa4: [compiler-rt][test] Set shared_libasan_path in test/asan/lit.cfg on Solaris
rCRT364394: [compiler-rt][test] Set shared_libasan_path in test/asan/lit.cfg on Solaris
rL364394: [compiler-rt][test] Set shared_libasan_path in test/asan/lit.cfg on Solaris
Summary

While checking warnings from the Solaris buildbots, I noticed

llvm-lit: /opt/llvm-buildbot/home/solaris11-amd64/clang-solaris11-amd64/llvm/projects/compiler-rt/test/asan/lit.cfg:119: warning: %shared_libasan substitution not set but dynamic ASan is available.

Fixed as follows. Tested on x86_64-pc-solaris2.11. Ok for trunk?

Diff Detail

Repository
rL LLVM

Event Timeline

ro created this revision.Jun 25 2019, 4:36 AM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptJun 25 2019, 4:36 AM
Herald added subscribers: Restricted Project, llvm-commits, fedor.sergeev and 2 others. · View Herald Transcript
ro updated this revision to Diff 206415.Jun 25 2019, 4:42 AM

Sorry, wrong patch.

eugenis accepted this revision.Jun 25 2019, 1:38 PM
eugenis added a subscriber: eugenis.

LGTM

This revision is now accepted and ready to land.Jun 25 2019, 1:38 PM
Closed by commit rL364394: [compiler-rt][test] Set shared_libasan_path in test/asan/lit.cfg on Solaris (authored by ro). · Explain WhyJun 26 2019, 1:20 AM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: delcypher. · View Herald TranscriptJun 26 2019, 1:20 AM

Revision Contents

PathSize
compiler-rt/
trunk/
test/
asan/
2 lines

Diff 206610

compiler-rt/trunk/test/asan/lit.cfg

Show First 20 Lines • Show All 105 Lines • ▼ Show 20 Lines
def build_invocation(compile_flags): def build_invocation(compile_flags):
return " " + " ".join([config.clang] + compile_flags) + " " return " " + " ".join([config.clang] + compile_flags) + " "
config.substitutions.append( ("%clang ", build_invocation(target_cflags)) ) config.substitutions.append( ("%clang ", build_invocation(target_cflags)) )
config.substitutions.append( ("%clangxx ", build_invocation(target_cxxflags)) ) config.substitutions.append( ("%clangxx ", build_invocation(target_cxxflags)) )
config.substitutions.append( ("%clang_asan ", build_invocation(clang_asan_cflags)) ) config.substitutions.append( ("%clang_asan ", build_invocation(clang_asan_cflags)) )
config.substitutions.append( ("%clangxx_asan ", build_invocation(clang_asan_cxxflags)) ) config.substitutions.append( ("%clangxx_asan ", build_invocation(clang_asan_cxxflags)) )
if config.asan_dynamic: if config.asan_dynamic:
if config.host_os in ['Linux', 'NetBSD']: if config.host_os in ['Linux', 'NetBSD', 'SunOS']:
shared_libasan_path = os.path.join(config.compiler_rt_libdir, "libclang_rt.asan{}.so".format(config.target_suffix)) shared_libasan_path = os.path.join(config.compiler_rt_libdir, "libclang_rt.asan{}.so".format(config.target_suffix))
elif config.host_os == 'Darwin': elif config.host_os == 'Darwin':
shared_libasan_path = os.path.join(config.compiler_rt_libdir, 'libclang_rt.asan_{}_dynamic.dylib'.format(config.apple_platform)) shared_libasan_path = os.path.join(config.compiler_rt_libdir, 'libclang_rt.asan_{}_dynamic.dylib'.format(config.apple_platform))
else: else:
lit_config.warning('%shared_libasan substitution not set but dynamic ASan is available.') lit_config.warning('%shared_libasan substitution not set but dynamic ASan is available.')
shared_libasan_path = None shared_libasan_path = None
if shared_libasan_path is not None: if shared_libasan_path is not None:
▲ Show 20 Lines • Show All 110 Lines • Show Last 20 Lines