diff options
| -rw-r--r-- | lldb/test/API/lit.cfg.py (renamed from lldb/test/API/lit.cfg) | 0 | ||||
| -rw-r--r-- | lldb/test/API/lit.site.cfg.py.in (renamed from lldb/test/API/lit.site.cfg.in) | 2 | ||||
| -rw-r--r-- | lldb/test/CMakeLists.txt | 24 |
3 files changed, 17 insertions, 9 deletions
diff --git a/lldb/test/API/lit.cfg b/lldb/test/API/lit.cfg.py index f29d9047e24..f29d9047e24 100644 --- a/lldb/test/API/lit.cfg +++ b/lldb/test/API/lit.cfg.py diff --git a/lldb/test/API/lit.site.cfg.in b/lldb/test/API/lit.site.cfg.py.in index 2f2956c002b..b5e8ed9df8d 100644 --- a/lldb/test/API/lit.site.cfg.in +++ b/lldb/test/API/lit.site.cfg.py.in @@ -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.load_config(config, "@LLDB_SOURCE_DIR@/test/API/lit.cfg") +lit_config.load_config(config, "@LLDB_SOURCE_DIR@/test/API/lit.cfg.py") diff --git a/lldb/test/CMakeLists.txt b/lldb/test/CMakeLists.txt index 33e6b13184f..4bee6ca2d67 100644 --- a/lldb/test/CMakeLists.txt +++ b/lldb/test/CMakeLists.txt @@ -87,32 +87,40 @@ if(NOT LLDB_BUILT_STANDALONE) ) 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) +# 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 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 the API test suite. 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 - ${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) |
