Author: hans Date: Wed Feb 15 13:01:37 2017 New Revision: 295216 URL: http://llvm.org/viewvc/llvm-project?rev=295216&view=rev Log: Merging r294425: ------------------------------------------------------------------------ r294425 | mgorny | 2017-02-08 00:43:44 -0800 (Wed, 08 Feb 2017) | 3 lines
[test] Enable the strace_test only if strace is installed Differential Revision: https://reviews.llvm.org/D29628 ------------------------------------------------------------------------ Modified: compiler-rt/branches/release_40/ (props changed) compiler-rt/branches/release_40/test/lsan/TestCases/strace_test.cc compiler-rt/branches/release_40/test/lsan/lit.common.cfg Propchange: compiler-rt/branches/release_40/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Feb 15 13:01:37 2017 @@ -1 +1 @@ -/compiler-rt/trunk:292517,293120,293536,294806,294886 +/compiler-rt/trunk:292517,293120,293536,294425,294806,294886 Modified: compiler-rt/branches/release_40/test/lsan/TestCases/strace_test.cc URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_40/test/lsan/TestCases/strace_test.cc?rev=295216&r1=295215&r2=295216&view=diff ============================================================================== --- compiler-rt/branches/release_40/test/lsan/TestCases/strace_test.cc (original) +++ compiler-rt/branches/release_40/test/lsan/TestCases/strace_test.cc Wed Feb 15 13:01:37 2017 @@ -1,4 +1,5 @@ // Test that lsan reports a proper error when running under strace. +// REQUIRES: strace // RUN: %clangxx_lsan %s -o %t // RUN: not strace -o /dev/null %run %t 2>&1 | FileCheck %s Modified: compiler-rt/branches/release_40/test/lsan/lit.common.cfg URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_40/test/lsan/lit.common.cfg?rev=295216&r1=295215&r2=295216&view=diff ============================================================================== --- compiler-rt/branches/release_40/test/lsan/lit.common.cfg (original) +++ compiler-rt/branches/release_40/test/lsan/lit.common.cfg Wed Feb 15 13:01:37 2017 @@ -4,6 +4,8 @@ import os +import lit.util + def get_required_attr(config, attr_name): attr_value = getattr(config, attr_name, None) if attr_value == None: @@ -29,6 +31,9 @@ else: lit_config.fatal("Unknown LSan test mode: %r" % lsan_lit_test_mode) config.name += config.name_suffix +if lit.util.which('strace'): + config.available_features.add('strace') + clang_cflags = ["-O0", config.target_cflags] + config.debug_info_flags clang_cxxflags = config.cxx_mode_flags + clang_cflags lsan_incdir = config.test_source_root + "/../" _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
