[PATCH] D14604: [tsan] Filter OS X architectures for unit testing

[Kuba Brecka via llvm-commits]

kubabrecka created this revision.
kubabrecka added reviewers: dvyukov, kcc, samsonov, glider.
kubabrecka added subscribers: llvm-commits, zaks.anna, ismailp.
Herald added a subscriber: aemerson.

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).

http://reviews.llvm.org/D14604

Files:
  lib/tsan/tests/CMakeLists.txt

Index: lib/tsan/tests/CMakeLists.txt
===================================================================
--- lib/tsan/tests/CMakeLists.txt
+++ lib/tsan/tests/CMakeLists.txt
@@ -33,8 +33,12 @@
 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})


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D14604.40015.patch
Type: text/x-patch
Size: 627 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20151112/e04693d0/attachment.bin>