summaryrefslogtreecommitdiffstats
path: root/clang
diff options
context:
space:
mode:
Diffstat (limited to 'clang')
-rw-r--r--clang/test/CMakeLists.txt8
-rw-r--r--clang/test/lit.cfg.py2
2 files changed, 8 insertions, 2 deletions
diff --git a/clang/test/CMakeLists.txt b/clang/test/CMakeLists.txt
index c1ac9e4f0f9..3bf69bf84b2 100644
--- a/clang/test/CMakeLists.txt
+++ b/clang/test/CMakeLists.txt
@@ -88,6 +88,14 @@ set(CLANG_TEST_PARAMS
clang_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
)
+if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/debuginfo-tests/CMakeLists.txt")
+ # This is a hack to keep existing build build infrastructure working while we
+ # can migrate to the new standard workflow of checking out debuginfo-tests into
+ # llvm/projects or using it in a mono-repo
+ set(DEBUGINFO_TESTS_EXCLUDE_FROM_ALL ON)
+ add_subdirectory(debuginfo-tests)
+endif()
+
if( NOT CLANG_BUILT_STANDALONE )
list(APPEND CLANG_TEST_DEPS
llvm-config
diff --git a/clang/test/lit.cfg.py b/clang/test/lit.cfg.py
index 39bdf36afd1..d2f0491821d 100644
--- a/clang/test/lit.cfg.py
+++ b/clang/test/lit.cfg.py
@@ -58,8 +58,6 @@ tool_dirs = [config.clang_tools_dir, config.llvm_tools_dir]
tools = [
'c-index-test', 'clang-check', 'clang-diff', 'clang-format', 'opt',
- ToolSubst('%test_debuginfo', command=os.path.join(
- config.llvm_src_root, 'utils', 'test_debuginfo.pl')),
ToolSubst('%clang_func_map', command=FindTool(
'clang-func-mapping'), unresolved='ignore'),
]
OpenPOWER on IntegriCloud