From 81a2b466e916ca6b38e1d98eae8c556d317b70ef Mon Sep 17 00:00:00 2001
From: Alexey Samsonov <samsonov@google.com>
Date: Fri, 14 Feb 2014 11:00:07 +0000
Subject: [PATCH] Move shared configs for lit test suites to test/ and
 unittests/ directories

llvm-svn: 201399
---
 compiler-rt/CMakeLists.txt                             |  6 ++----
 compiler-rt/lib/CMakeLists.txt                         | 10 ----------
 .../lib/asan/lit_tests/GenericConfig/lit.site.cfg.in   |  2 +-
 compiler-rt/lib/asan/lit_tests/Unit/lit.site.cfg.in    |  2 +-
 compiler-rt/lib/dfsan/lit_tests/lit.site.cfg.in        |  2 +-
 .../lib/lsan/lit_tests/AsanConfig/lit.site.cfg.in      |  2 +-
 .../lib/lsan/lit_tests/LsanConfig/lit.site.cfg.in      |  2 +-
 compiler-rt/lib/lsan/lit_tests/Unit/lit.site.cfg.in    |  2 +-
 compiler-rt/lib/msan/lit_tests/Unit/lit.site.cfg.in    |  2 +-
 compiler-rt/lib/msan/lit_tests/lit.site.cfg.in         |  2 +-
 compiler-rt/lib/sanitizer_common/tests/lit.site.cfg.in |  2 +-
 compiler-rt/lib/tsan/lit_tests/Unit/lit.site.cfg.in    |  2 +-
 compiler-rt/lib/tsan/lit_tests/lit.site.cfg.in         |  2 +-
 .../lib/ubsan/lit_tests/AsanConfig/lit.site.cfg.in     |  2 +-
 .../lib/ubsan/lit_tests/UbsanConfig/lit.site.cfg.in    |  2 +-
 compiler-rt/test/CMakeLists.txt                        |  7 +++++++
 compiler-rt/{lib => test}/lit.common.cfg               |  0
 compiler-rt/{lib => test}/lit.common.configured.in     |  2 +-
 compiler-rt/unittests/CMakeLists.txt                   |  3 +++
 compiler-rt/{lib => unittests}/lit.common.unit.cfg     |  0
 .../{lib => unittests}/lit.common.unit.configured.in   |  2 +-
 21 files changed, 27 insertions(+), 29 deletions(-)
 create mode 100644 compiler-rt/test/CMakeLists.txt
 rename compiler-rt/{lib => test}/lit.common.cfg (100%)
 rename compiler-rt/{lib => test}/lit.common.configured.in (93%)
 create mode 100644 compiler-rt/unittests/CMakeLists.txt
 rename compiler-rt/{lib => unittests}/lit.common.unit.cfg (100%)
 rename compiler-rt/{lib => unittests}/lit.common.unit.configured.in (90%)

diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
index 55fe62f55104..97cd61455697 100644
--- a/compiler-rt/CMakeLists.txt
+++ b/compiler-rt/CMakeLists.txt
@@ -248,8 +248,6 @@ endif()
 add_subdirectory(lib)
 
 if(LLVM_INCLUDE_TESTS)
-  # Currently the tests have not been ported to CMake, so disable this
-  # directory.
-  #
-  #add_subdirectory(test)
+  add_subdirectory(test)
+  add_subdirectory(unittests)
 endif()
diff --git a/compiler-rt/lib/CMakeLists.txt b/compiler-rt/lib/CMakeLists.txt
index 9c4e29894a1a..4b37b254d4d8 100644
--- a/compiler-rt/lib/CMakeLists.txt
+++ b/compiler-rt/lib/CMakeLists.txt
@@ -34,13 +34,3 @@ if(LLVM_USE_SANITIZER STREQUAL "")
 endif()
 
 add_subdirectory(builtins)
-
-# Generate configs for running lit and unit tests.
-configure_lit_site_cfg(
-  ${CMAKE_CURRENT_SOURCE_DIR}/lit.common.configured.in
-  ${CMAKE_CURRENT_BINARY_DIR}/lit.common.configured)
-
-configure_lit_site_cfg(
-  ${CMAKE_CURRENT_SOURCE_DIR}/lit.common.unit.configured.in
-  ${CMAKE_CURRENT_BINARY_DIR}/lit.common.unit.configured)
-
diff --git a/compiler-rt/lib/asan/lit_tests/GenericConfig/lit.site.cfg.in b/compiler-rt/lib/asan/lit_tests/GenericConfig/lit.site.cfg.in
index 7ecf0e581507..7d552f3fcbf8 100644
--- a/compiler-rt/lib/asan/lit_tests/GenericConfig/lit.site.cfg.in
+++ b/compiler-rt/lib/asan/lit_tests/GenericConfig/lit.site.cfg.in
@@ -11,7 +11,7 @@ config.bits = "@ASAN_TEST_BITS@"
 config.android = "@CAN_TARGET_arm_android@"
 
 # Load common config for all compiler-rt lit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
 
 # Load tool-specific config that would do the real work.
 lit_config.load_config(config, "@ASAN_SOURCE_DIR@/lit_tests/lit.cfg")
diff --git a/compiler-rt/lib/asan/lit_tests/Unit/lit.site.cfg.in b/compiler-rt/lib/asan/lit_tests/Unit/lit.site.cfg.in
index 6e4adfc4ced7..f6d9ed94dcc7 100644
--- a/compiler-rt/lib/asan/lit_tests/Unit/lit.site.cfg.in
+++ b/compiler-rt/lib/asan/lit_tests/Unit/lit.site.cfg.in
@@ -2,7 +2,7 @@
 # Do not edit!
 
 # Load common config for all compiler-rt unit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.unit.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/unittests/lit.common.unit.configured")
 
 # Setup config name.
 config.name = 'AddressSanitizer-Unit'
diff --git a/compiler-rt/lib/dfsan/lit_tests/lit.site.cfg.in b/compiler-rt/lib/dfsan/lit_tests/lit.site.cfg.in
index 0cf6d6b5580f..7c366a01f02f 100644
--- a/compiler-rt/lib/dfsan/lit_tests/lit.site.cfg.in
+++ b/compiler-rt/lib/dfsan/lit_tests/lit.site.cfg.in
@@ -1,5 +1,5 @@
 # Load common config for all compiler-rt lit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
 
 # Load tool-specific config that would do the real work.
 lit_config.load_config(config, "@DFSAN_SOURCE_DIR@/lit_tests/lit.cfg")
diff --git a/compiler-rt/lib/lsan/lit_tests/AsanConfig/lit.site.cfg.in b/compiler-rt/lib/lsan/lit_tests/AsanConfig/lit.site.cfg.in
index 9cf6572c54b7..95f006954e57 100644
--- a/compiler-rt/lib/lsan/lit_tests/AsanConfig/lit.site.cfg.in
+++ b/compiler-rt/lib/lsan/lit_tests/AsanConfig/lit.site.cfg.in
@@ -1,5 +1,5 @@
 # Load common config for all compiler-rt lit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
 
 # Tool-specific config options.
 config.lsan_lit_src_root = "@LSAN_LIT_SOURCE_DIR@"
diff --git a/compiler-rt/lib/lsan/lit_tests/LsanConfig/lit.site.cfg.in b/compiler-rt/lib/lsan/lit_tests/LsanConfig/lit.site.cfg.in
index 2a6d724c0436..8e9076e9405a 100644
--- a/compiler-rt/lib/lsan/lit_tests/LsanConfig/lit.site.cfg.in
+++ b/compiler-rt/lib/lsan/lit_tests/LsanConfig/lit.site.cfg.in
@@ -1,5 +1,5 @@
 # Load common config for all compiler-rt lit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
 
 # Tool-specific config options.
 config.lsan_lit_src_root = "@LSAN_LIT_SOURCE_DIR@"
diff --git a/compiler-rt/lib/lsan/lit_tests/Unit/lit.site.cfg.in b/compiler-rt/lib/lsan/lit_tests/Unit/lit.site.cfg.in
index a3a4e9ad0b13..a3db63fe6350 100644
--- a/compiler-rt/lib/lsan/lit_tests/Unit/lit.site.cfg.in
+++ b/compiler-rt/lib/lsan/lit_tests/Unit/lit.site.cfg.in
@@ -2,7 +2,7 @@
 # Do not edit!
 
 # Load common config for all compiler-rt unit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.unit.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/unittests/lit.common.unit.configured")
 
 # Setup config name.
 config.name = 'LeakSanitizer-Unit'
diff --git a/compiler-rt/lib/msan/lit_tests/Unit/lit.site.cfg.in b/compiler-rt/lib/msan/lit_tests/Unit/lit.site.cfg.in
index 8e67f557d7fd..34ae3c0e0175 100644
--- a/compiler-rt/lib/msan/lit_tests/Unit/lit.site.cfg.in
+++ b/compiler-rt/lib/msan/lit_tests/Unit/lit.site.cfg.in
@@ -2,7 +2,7 @@
 # Do not edit!
 
 # Load common config for all compiler-rt unit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.unit.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/unittests/lit.common.unit.configured")
 
 # Setup config name.
 config.name = 'MemorySanitizer-Unit'
diff --git a/compiler-rt/lib/msan/lit_tests/lit.site.cfg.in b/compiler-rt/lib/msan/lit_tests/lit.site.cfg.in
index 946df778f3d3..6d1eccc01da8 100644
--- a/compiler-rt/lib/msan/lit_tests/lit.site.cfg.in
+++ b/compiler-rt/lib/msan/lit_tests/lit.site.cfg.in
@@ -1,5 +1,5 @@
 # Load common config for all compiler-rt lit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
 
 # Load tool-specific config that would do the real work.
 lit_config.load_config(config, "@MSAN_SOURCE_DIR@/lit_tests/lit.cfg")
diff --git a/compiler-rt/lib/sanitizer_common/tests/lit.site.cfg.in b/compiler-rt/lib/sanitizer_common/tests/lit.site.cfg.in
index 5ceb9e4c5c28..59a059054568 100644
--- a/compiler-rt/lib/sanitizer_common/tests/lit.site.cfg.in
+++ b/compiler-rt/lib/sanitizer_common/tests/lit.site.cfg.in
@@ -2,7 +2,7 @@
 # Do not edit!
 
 # Load common config for all compiler-rt unit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.unit.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/unittests/lit.common.unit.configured")
 
 # Setup config name.
 config.name = 'SanitizerCommon-Unit'
diff --git a/compiler-rt/lib/tsan/lit_tests/Unit/lit.site.cfg.in b/compiler-rt/lib/tsan/lit_tests/Unit/lit.site.cfg.in
index 3701a2cad74c..5d7242d11592 100644
--- a/compiler-rt/lib/tsan/lit_tests/Unit/lit.site.cfg.in
+++ b/compiler-rt/lib/tsan/lit_tests/Unit/lit.site.cfg.in
@@ -2,7 +2,7 @@
 # Do not edit!
 
 # Load common config for all compiler-rt unit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.unit.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/unittests/lit.common.unit.configured")
 
 # Load tool-specific config that would do the real work.
 lit_config.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/Unit/lit.cfg")
diff --git a/compiler-rt/lib/tsan/lit_tests/lit.site.cfg.in b/compiler-rt/lib/tsan/lit_tests/lit.site.cfg.in
index b0e427446eaa..aebdd5ebc1ff 100644
--- a/compiler-rt/lib/tsan/lit_tests/lit.site.cfg.in
+++ b/compiler-rt/lib/tsan/lit_tests/lit.site.cfg.in
@@ -2,7 +2,7 @@
 # Do not edit!
 
 # Load common config for all compiler-rt lit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
 
 # Load tool-specific config that would do the real work.
 lit_config.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/lit.cfg")
diff --git a/compiler-rt/lib/ubsan/lit_tests/AsanConfig/lit.site.cfg.in b/compiler-rt/lib/ubsan/lit_tests/AsanConfig/lit.site.cfg.in
index f75741838f83..03d55fc56f15 100644
--- a/compiler-rt/lib/ubsan/lit_tests/AsanConfig/lit.site.cfg.in
+++ b/compiler-rt/lib/ubsan/lit_tests/AsanConfig/lit.site.cfg.in
@@ -1,5 +1,5 @@
 # Load common config for all compiler-rt lit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
 
 # Tool-specific config options.
 config.ubsan_lit_tests_dir = "@UBSAN_LIT_TESTS_DIR@"
diff --git a/compiler-rt/lib/ubsan/lit_tests/UbsanConfig/lit.site.cfg.in b/compiler-rt/lib/ubsan/lit_tests/UbsanConfig/lit.site.cfg.in
index c08fc30d0042..6554bac86c2f 100644
--- a/compiler-rt/lib/ubsan/lit_tests/UbsanConfig/lit.site.cfg.in
+++ b/compiler-rt/lib/ubsan/lit_tests/UbsanConfig/lit.site.cfg.in
@@ -1,5 +1,5 @@
 # Load common config for all compiler-rt lit tests.
-lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/lib/lit.common.configured")
+lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
 
 # Tool-specific config options.
 config.ubsan_lit_tests_dir = "@UBSAN_LIT_TESTS_DIR@"
diff --git a/compiler-rt/test/CMakeLists.txt b/compiler-rt/test/CMakeLists.txt
new file mode 100644
index 000000000000..1ab0cb5229b4
--- /dev/null
+++ b/compiler-rt/test/CMakeLists.txt
@@ -0,0 +1,7 @@
+configure_lit_site_cfg(
+  ${CMAKE_CURRENT_SOURCE_DIR}/lit.common.configured.in
+  ${CMAKE_CURRENT_BINARY_DIR}/lit.common.configured)
+
+# BlocksRuntime and builtins testsuites are not yet ported to lit.
+# add_subdirectory(BlocksRuntime)
+# add_subdirectory(builtins)
diff --git a/compiler-rt/lib/lit.common.cfg b/compiler-rt/test/lit.common.cfg
similarity index 100%
rename from compiler-rt/lib/lit.common.cfg
rename to compiler-rt/test/lit.common.cfg
diff --git a/compiler-rt/lib/lit.common.configured.in b/compiler-rt/test/lit.common.configured.in
similarity index 93%
rename from compiler-rt/lib/lit.common.configured.in
rename to compiler-rt/test/lit.common.configured.in
index bfed0424c79a..3b1083021f4f 100644
--- a/compiler-rt/lib/lit.common.configured.in
+++ b/compiler-rt/test/lit.common.configured.in
@@ -29,4 +29,4 @@ except KeyError,e:
   lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key, key))
 
 # Setup attributes common for all compiler-rt projects.
-lit_config.load_config(config, "@COMPILER_RT_SOURCE_DIR@/lib/lit.common.cfg")
+lit_config.load_config(config, "@COMPILER_RT_SOURCE_DIR@/test/lit.common.cfg")
diff --git a/compiler-rt/unittests/CMakeLists.txt b/compiler-rt/unittests/CMakeLists.txt
new file mode 100644
index 000000000000..fe2c39781a95
--- /dev/null
+++ b/compiler-rt/unittests/CMakeLists.txt
@@ -0,0 +1,3 @@
+configure_lit_site_cfg(
+  ${CMAKE_CURRENT_SOURCE_DIR}/lit.common.unit.configured.in
+  ${CMAKE_CURRENT_BINARY_DIR}/lit.common.unit.configured)
diff --git a/compiler-rt/lib/lit.common.unit.cfg b/compiler-rt/unittests/lit.common.unit.cfg
similarity index 100%
rename from compiler-rt/lib/lit.common.unit.cfg
rename to compiler-rt/unittests/lit.common.unit.cfg
diff --git a/compiler-rt/lib/lit.common.unit.configured.in b/compiler-rt/unittests/lit.common.unit.configured.in
similarity index 90%
rename from compiler-rt/lib/lit.common.unit.configured.in
rename to compiler-rt/unittests/lit.common.unit.configured.in
index f2c5373f34ba..fe827c638beb 100644
--- a/compiler-rt/lib/lit.common.unit.configured.in
+++ b/compiler-rt/unittests/lit.common.unit.configured.in
@@ -21,4 +21,4 @@ except KeyError,e:
   lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key, key))
 
 # Setup attributes common for all compiler-rt unit tests.
-lit_config.load_config(config, "@COMPILER_RT_SOURCE_DIR@/lib/lit.common.unit.cfg")
+lit_config.load_config(config, "@COMPILER_RT_SOURCE_DIR@/unittests/lit.common.unit.cfg")