[compiler-rt] r248830 - [CFI] Make CFI tests require UBSan (for diagnostic mode).

[Alexey Samsonov via llvm-commits]

Author: samsonov
Date: Tue Sep 29 16:43:37 2015
New Revision: 248830

URL: http://llvm.org/viewvc/llvm-project?rev=248830&view=rev
Log:
[CFI] Make CFI tests require UBSan (for diagnostic mode).

CFI itself, on the other hand, doesn't require anything, including
sanitizer_common.

Modified:
    compiler-rt/trunk/lib/CMakeLists.txt
    compiler-rt/trunk/test/CMakeLists.txt

Modified: compiler-rt/trunk/lib/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/CMakeLists.txt?rev=248830&r1=248829&r2=248830&view=diff
==============================================================================
--- compiler-rt/trunk/lib/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/CMakeLists.txt Tue Sep 29 16:43:37 2015
@@ -15,11 +15,12 @@ if(COMPILER_RT_BUILD_SANITIZERS)
 
   if(COMPILER_RT_HAS_SANITIZER_COMMON)
     add_subdirectory(sanitizer_common)
-    add_subdirectory(cfi)
     add_subdirectory(lsan)
     add_subdirectory(ubsan)
   endif()
 
+  add_subdirectory(cfi)
+
   if(COMPILER_RT_HAS_ASAN)
     add_subdirectory(asan)
   endif()

Modified: compiler-rt/trunk/test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/CMakeLists.txt?rev=248830&r1=248829&r2=248830&view=diff
==============================================================================
--- compiler-rt/trunk/test/CMakeLists.txt (original)
+++ compiler-rt/trunk/test/CMakeLists.txt Tue Sep 29 16:43:37 2015
@@ -60,7 +60,10 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS)
   if(COMPILER_RT_HAS_UBSAN)
     add_subdirectory(ubsan)
   endif()
-  add_subdirectory(cfi)
+  # CFI tests require diagnostic mode, which is implemented in UBSan.
+  if(COMPILER_RT_HAS_UBSAN)
+    add_subdirectory(cfi)
+  endif()
   if(COMPILER_RT_HAS_SAFESTACK)
     add_subdirectory(safestack)
   endif()