Move config for sanitizer_common tests under test/ for consistency

llvm-svn: 201779

compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt

@@ -143,18 +143,6 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS)
   if(CAN_TARGET_i386)
     add_sanitizer_tests_for_arch(i386)
   endif()
-
-  # Run unittests as a part of lit testsuite.
-  configure_lit_site_cfg(
-    ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
-    ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
-    )
-
-  add_lit_testsuite(check-sanitizer "Running sanitizer library unittests"
-    ${CMAKE_CURRENT_BINARY_DIR}
-    DEPENDS SanitizerUnitTests
-    )
-  set_target_properties(check-sanitizer PROPERTIES FOLDER "Sanitizer unittests")
 endif()
 
 if(ANDROID)

compiler-rt/test/CMakeLists.txt

@@ -36,6 +36,9 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS)
   if(MSAN_SUPPORTED_ARCH)
     add_subdirectory(msan)
   endif()
+  if(SANITIZER_COMMON_SUPPORTED_ARCH)
+    add_subdirectory(sanitizer_common)
+  endif()
   if(TSAN_SUPPORTED_ARCH)
     add_subdirectory(tsan)
   endif()

compiler-rt/test/sanitizer_common/CMakeLists.txt

@@ -0,0 +1,9 @@
+if(COMPILER_RT_INCLUDE_TESTS)
+  configure_lit_site_cfg(
+    ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
+    ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg)
+  add_lit_testsuite(check-sanitizer "Running sanitizer library unittests"
+    ${CMAKE_CURRENT_BINARY_DIR}
+    DEPENDS SanitizerUnitTests)
+  set_target_properties(check-sanitizer PROPERTIES FOLDER "Sanitizer unittests")
+endif()

compiler-rt/test/sanitizer_common/lit.site.cfg.in

@@ -9,6 +9,7 @@ config.name = 'SanitizerCommon-Unit'
 
 # Setup test source and exec root. For unit tests, we define
 # it as build directory with sanitizer_common tests.
+# FIXME: De-hardcode this path.
 config.test_exec_root = os.path.join("@COMPILER_RT_BINARY_DIR@", "lib",
                                      "sanitizer_common", "tests")
 config.test_source_root = config.test_exec_root