[test] Reduce inconsistency between lit configuration files.
authorJonas Devlieghere <jonas@devlieghere.com>
Thu, 10 Oct 2019 21:49:22 +0000 (21:49 +0000)
committerJonas Devlieghere <jonas@devlieghere.com>
Thu, 10 Oct 2019 21:49:22 +0000 (21:49 +0000)
Add the Python extension to the configuration files in the API directory
to match the other test suites.

llvm-svn: 374461

lldb/test/API/lit.cfg.py [moved from lldb/test/API/lit.cfg with 100% similarity]
lldb/test/API/lit.site.cfg.py.in [moved from lldb/test/API/lit.site.cfg.in with 99% similarity]
lldb/test/CMakeLists.txt

similarity index 99%
rename from lldb/test/API/lit.site.cfg.in
rename to lldb/test/API/lit.site.cfg.py.in
index 2f2956c..b5e8ed9 100644 (file)
@@ -44,4 +44,4 @@ except KeyError as e:
     lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key))
 
 # Let the main config do the real work.
     lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key))
 
 # Let the main config do the real work.
-lit_config.load_config(config, "@LLDB_SOURCE_DIR@/test/API/lit.cfg")
+lit_config.load_config(config, "@LLDB_SOURCE_DIR@/test/API/lit.cfg.py")
index 33e6b13..4bee6ca 100644 (file)
@@ -87,32 +87,40 @@ if(NOT LLDB_BUILT_STANDALONE)
   )
 endif()
 
   )
 endif()
 
-# the value is not canonicalized within LLVM
+# These values are not canonicalized within LLVM.
 llvm_canonicalize_cmake_booleans(
   LLDB_DISABLE_PYTHON
   LLVM_ENABLE_ZLIB
   LLVM_ENABLE_SHARED_LIBS
   LLDB_IS_64_BITS)
 
 llvm_canonicalize_cmake_booleans(
   LLDB_DISABLE_PYTHON
   LLVM_ENABLE_ZLIB
   LLVM_ENABLE_SHARED_LIBS
   LLDB_IS_64_BITS)
 
+# Configure the top level test suite.
+configure_lit_site_cfg(
+  ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
+  ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py
+  MAIN_CONFIG
+  ${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py)
+
+# Configure the Shell test suite.
 configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/Shell/lit.site.cfg.py.in
   ${CMAKE_CURRENT_BINARY_DIR}/Shell/lit.site.cfg.py
   MAIN_CONFIG
   ${CMAKE_CURRENT_SOURCE_DIR}/Shell/lit.cfg.py)
 configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/Shell/lit.site.cfg.py.in
   ${CMAKE_CURRENT_BINARY_DIR}/Shell/lit.site.cfg.py
   MAIN_CONFIG
   ${CMAKE_CURRENT_SOURCE_DIR}/Shell/lit.cfg.py)
+
+# Configure the Unit test suite.
 configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.py.in
   ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg.py
   MAIN_CONFIG
   ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.cfg.py)
 configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.py.in
   ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg.py
   MAIN_CONFIG
   ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.cfg.py)
+
+# Configure the API test suite.
 configure_lit_site_cfg(
 configure_lit_site_cfg(
-  ${CMAKE_CURRENT_SOURCE_DIR}/API/lit.site.cfg.in
-  ${CMAKE_CURRENT_BINARY_DIR}/API/lit.site.cfg)
-configure_lit_site_cfg(
-  ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
-  ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py
+  ${CMAKE_CURRENT_SOURCE_DIR}/API/lit.site.cfg.py.in
+  ${CMAKE_CURRENT_BINARY_DIR}/API/lit.site.cfg.py
   MAIN_CONFIG
   MAIN_CONFIG
-  ${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py)
-
+  ${CMAKE_CURRENT_SOURCE_DIR}/API/lit.cfg.py)
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/Shell/lit-lldb-init.in
   ${CMAKE_CURRENT_BINARY_DIR}/Shell/lit-lldb-init)
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/Shell/lit-lldb-init.in
   ${CMAKE_CURRENT_BINARY_DIR}/Shell/lit-lldb-init)