diff options
| author | Alexey Samsonov <samsonov@google.com> | 2013-12-05 12:57:55 +0000 |
|---|---|---|
| committer | Alexey Samsonov <samsonov@google.com> | 2013-12-05 12:57:55 +0000 |
| commit | a320b596bedf15789acfd8e57754df4aa479826e (patch) | |
| tree | 67fa2afa8750dc2d3aa600df7bc65e26ffbd2746 | |
| parent | b37127085cbcc79f5f859bfab8e7204201c18287 (diff) | |
| download | compiler-rt-a320b596bedf15789acfd8e57754df4aa479826e.tar.gz | |
Merging r196501:
------------------------------------------------------------------------
r196501 | samsonov | 2013-12-05 16:53:36 +0400 (Thu, 05 Dec 2013) | 1 line
Run TSan/MSan lit tests only on 64-bit platforms
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/branches/release_34@196502 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/msan/lit_tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lib/msan/lit_tests/lit.cfg | 3 | ||||
| -rw-r--r-- | lib/tsan/lit_tests/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | lib/tsan/lit_tests/lit.cfg | 3 |
4 files changed, 7 insertions, 5 deletions
diff --git a/lib/msan/lit_tests/CMakeLists.txt b/lib/msan/lit_tests/CMakeLists.txt index 3fcb3480f..38d1e59e7 100644 --- a/lib/msan/lit_tests/CMakeLists.txt +++ b/lib/msan/lit_tests/CMakeLists.txt @@ -11,7 +11,7 @@ if(MSAN_CAN_INSTRUMENT_LIBCXX) ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg) endif() -if(COMPILER_RT_CAN_EXECUTE_TESTS) +if(COMPILER_RT_CAN_EXECUTE_TESTS AND CAN_TARGET_x86_64) # Run MSan tests only if we're sure we may produce working binaries. set(MSAN_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS} diff --git a/lib/msan/lit_tests/lit.cfg b/lib/msan/lit_tests/lit.cfg index fd88ca04d..da1bde6dd 100644 --- a/lib/msan/lit_tests/lit.cfg +++ b/lib/msan/lit_tests/lit.cfg @@ -56,7 +56,8 @@ clang_msan_cflags = ["-fsanitize=memory", "-mno-omit-leaf-frame-pointer", "-fno-omit-frame-pointer", "-fno-optimize-sibling-calls", - "-g"] + "-g", + "-m64"] clang_msan_cxxflags = ["--driver-mode=g++ "] + clang_msan_cflags config.substitutions.append( ("%clang_msan ", " ".join([config.clang] + clang_msan_cflags) + diff --git a/lib/tsan/lit_tests/CMakeLists.txt b/lib/tsan/lit_tests/CMakeLists.txt index 53e5015d1..1f2fbf98e 100644 --- a/lib/tsan/lit_tests/CMakeLists.txt +++ b/lib/tsan/lit_tests/CMakeLists.txt @@ -8,7 +8,7 @@ configure_lit_site_cfg( ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg ) -if(COMPILER_RT_CAN_EXECUTE_TESTS) +if(COMPILER_RT_CAN_EXECUTE_TESTS AND CAN_TARGET_x86_64) # Run TSan output tests only if we're sure we can produce working binaries. set(TSAN_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS} @@ -25,7 +25,7 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS) DEPENDS ${TSAN_TEST_DEPS} ) set_target_properties(check-tsan PROPERTIES FOLDER "TSan unittests") -elseif(LLVM_INCLUDE_TESTS) +elseif(LLVM_INCLUDE_TESTS AND CAN_TARGET_x86_64) # Otherwise run only TSan unit tests (they are linked using the # host compiler). add_lit_testsuite(check-tsan "Running ThreadSanitizer tests" diff --git a/lib/tsan/lit_tests/lit.cfg b/lib/tsan/lit_tests/lit.cfg index 0cdb4d838..c4193639f 100644 --- a/lib/tsan/lit_tests/lit.cfg +++ b/lib/tsan/lit_tests/lit.cfg @@ -62,7 +62,8 @@ clang_tsan_cflags = ("-fsanitize=thread " + "-g " + "-Wall " + "-lpthread " - + "-ldl ") + + "-ldl " + + "-m64 ") clang_tsan_cxxflags = "--driver-mode=g++ " + clang_tsan_cflags config.substitutions.append( ("%clangxx_tsan ", (" " + config.clang + " " + clang_tsan_cxxflags + " ")) ) |