Drop test/asan/GenericConfig directory

llvm-svn: 201552

diff --git a/compiler-rt/test/asan/CMakeLists.txt b/compiler-rt/test/asan/CMakeLists.txt
index 4c4f33e..aaf315a 100644 (file)
--- a/compiler-rt/test/asan/CMakeLists.txt
+++ b/compiler-rt/test/asan/CMakeLists.txt
@@ -11,7 +11,7 @@ if(CAN_TARGET_arm_android)
   set(ASAN_TEST_BITS "32")
   get_target_flags_for_arch(arm_android ASAN_TEST_TARGET_CFLAGS)
   configure_lit_site_cfg(
-    ${CMAKE_CURRENT_SOURCE_DIR}/GenericConfig/lit.site.cfg.in
+    ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
     ${CMAKE_CURRENT_BINARY_DIR}/ARMAndroidConfig/lit.site.cfg
     )
   list(APPEND ASAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/ARMAndroidConfig)
@@ -22,7 +22,7 @@ if(CAN_TARGET_x86_64 OR CAN_TARGET_powerpc64)
   set(ASAN_TEST_BITS "64")
   set(ASAN_TEST_TARGET_CFLAGS ${TARGET_64_BIT_CFLAGS})
   configure_lit_site_cfg(
-    ${CMAKE_CURRENT_SOURCE_DIR}/GenericConfig/lit.site.cfg.in
+    ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
     ${CMAKE_CURRENT_BINARY_DIR}/64bitConfig/lit.site.cfg
     )
   list(APPEND ASAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/64bitConfig)
@@ -33,7 +33,7 @@ if(CAN_TARGET_i386)
   set(ASAN_TEST_BITS "32")
   set(ASAN_TEST_TARGET_CFLAGS ${TARGET_32_BIT_CFLAGS})
   configure_lit_site_cfg(
-    ${CMAKE_CURRENT_SOURCE_DIR}/GenericConfig/lit.site.cfg.in
+    ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
     ${CMAKE_CURRENT_BINARY_DIR}/32bitConfig/lit.site.cfg
     )
   list(APPEND ASAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/32bitConfig)

diff --git a/compiler-rt/test/asan/GenericConfig/lit.site.cfg.in b/compiler-rt/test/asan/lit.site.cfg.in
similarity index 100%
rename from compiler-rt/test/asan/GenericConfig/lit.site.cfg.in
rename to compiler-rt/test/asan/lit.site.cfg.in