[compiler-rt] r252873 - [tsan] Filter OS X architectures for unit testing

Kuba Brecka via llvm-commits llvm-commits at lists.llvm.org
Thu Nov 12 03:00:38 PST 2015


Author: kuba.brecka
Date: Thu Nov 12 05:00:38 2015
New Revision: 252873

URL: http://llvm.org/viewvc/llvm-project?rev=252873&view=rev
Log:
[tsan] Filter OS X architectures for unit testing

The TSan unit test build currently fails if we're also building the iOS parts of compiler-rt, because `TSAN_SUPPORTED_ARCH` contains ARM64. For unit tests, we need to filter this only to host architecture(s).

Differential Revision: http://reviews.llvm.org/D14604


Modified:
    compiler-rt/trunk/lib/tsan/tests/CMakeLists.txt

Modified: compiler-rt/trunk/lib/tsan/tests/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/tests/CMakeLists.txt?rev=252873&r1=252872&r2=252873&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/tests/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/tsan/tests/CMakeLists.txt Thu Nov 12 05:00:38 2015
@@ -33,8 +33,12 @@ macro(tsan_compile obj_list source arch)
 endmacro()
 
 macro(add_tsan_unittest testname)
+  set(TSAN_TEST_ARCH ${TSAN_SUPPORTED_ARCH})
+  if(APPLE)
+    darwin_filter_host_archs(TSAN_SUPPORTED_ARCH TSAN_TEST_ARCH)
+  endif()
   if(UNIX)
-    foreach(arch ${TSAN_SUPPORTED_ARCH})
+    foreach(arch ${TSAN_TEST_ARCH})
       cmake_parse_arguments(TEST "" "" "SOURCES;HEADERS" ${ARGN})
       set(TEST_OBJECTS)
       foreach(SOURCE ${TEST_SOURCES} ${COMPILER_RT_GTEST_SOURCE})




More information about the llvm-commits mailing list