Move LSan test suite under test/

llvm-svn: 201408

compiler-rt/CMakeLists.txt

@@ -232,6 +232,7 @@ endif()
 filter_available_targets(SANITIZER_COMMON_SUPPORTED_ARCH
   x86_64 i386 powerpc64 arm)
 filter_available_targets(DFSAN_SUPPORTED_ARCH x86_64)
+filter_available_targets(LSAN_SUPPORTED_ARCH x86_64)
 filter_available_targets(UBSAN_SUPPORTED_ARCH x86_64 i386)
 
 add_subdirectory(include)

compiler-rt/lib/lsan/CMakeLists.txt

@@ -22,11 +22,7 @@ set(LSAN_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 filter_available_targets(LSAN_COMMON_SUPPORTED_ARCH
   x86_64 i386 powerpc64 arm)
 
-# Architectures supported by the standalone LSan.
-filter_available_targets(LSAN_SUPPORTED_ARCH
-  x86_64)
-
-set(LSAN_RUNTIME_LIBRARIES)
+add_custom_target(lsan)
 
 if(APPLE)
   foreach(os ${SANITIZER_COMMON_SUPPORTED_DARWIN_OS})
@@ -50,8 +46,6 @@ elseif(NOT ANDROID)
               $<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}>
               $<TARGET_OBJECTS:RTLSanCommon.${arch}>
       CFLAGS ${LSAN_CFLAGS})
-    list(APPEND LSAN_RUNTIME_LIBRARIES clang_rt.lsan-${arch})
+    add_dependencies(lsan clang_rt.lsan-${arch})
   endforeach()
 endif()
-
-add_subdirectory(lit_tests)

compiler-rt/test/CMakeLists.txt

@@ -12,6 +12,9 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS)
   if(DFSAN_SUPPORTED_ARCH)
     add_subdirectory(dfsan)
   endif()
+  if(LSAN_SUPPORTED_ARCH)
+    add_subdirectory(lsan)
+  endif()
   if(UBSAN_SUPPORTED_ARCH)
     add_subdirectory(ubsan)
   endif()

compiler-rt/test/lsan/CMakeLists.txt

@@ -1,6 +1,3 @@
-set(LSAN_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..)
-set(LSAN_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/..)
-
 set(LSAN_LIT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
 configure_lit_site_cfg(
@@ -16,10 +13,8 @@ configure_lit_site_cfg(
 if(COMPILER_RT_CAN_EXECUTE_TESTS AND NOT APPLE AND NOT ANDROID)
   set(LSAN_TEST_DEPS
     ${SANITIZER_COMMON_LIT_TEST_DEPS}
-    ${LSAN_RUNTIME_LIBRARIES})
-  foreach(arch ${LSAN_SUPPORTED_ARCH})
-    list(APPEND LSAN_TEST_DEPS clang_rt.asan-${arch})
-  endforeach()
+    lsan
+    asan_runtime_libraries)
   add_lit_testsuite(check-lsan "Running the LeakSanitizer tests"
     ${CMAKE_CURRENT_BINARY_DIR}/LsanConfig
     ${CMAKE_CURRENT_BINARY_DIR}/AsanConfig