This revision was not accepted when it landed; it landed in state "Needs
Review".
This revision was automatically updated to reflect the committed changes.
Closed by commit rL320494: [debuginfo-tests] Add support for moving
debuginfo-tests from clang/test to… (authored by dhinton, committed by ).
Repository:
rL LLVM
https://reviews.llvm.org/D41055
Files:
cfe/trunk/test/CMakeLists.txt
cfe/trunk/test/lit.cfg.py
Index: cfe/trunk/test/lit.cfg.py
===================================================================
--- cfe/trunk/test/lit.cfg.py
+++ cfe/trunk/test/lit.cfg.py
@@ -58,12 +58,20 @@
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'),
]
+# FIXME: This logic can be removed once all buildbots have moved
+# debuginfo-test from clang/test to llvm/projects or monorepo.
+if os.path.exists(os.path.join(config.test_source_root, 'debuginfo-tests')):
+ if os.path.isfile(
+ os.path.join(config.test_source_root, 'debuginfo-tests', 'lit.cfg.py')):
+ config.excludes.append('debuginfo-tests')
+ else:
+ tools.append(ToolSubst('%test_debuginfo', command=os.path.join(
+ config.llvm_src_root, 'utils', 'test_debuginfo.pl')))
+
if config.clang_examples:
tools.append('clang-interpreter')
Index: cfe/trunk/test/CMakeLists.txt
===================================================================
--- cfe/trunk/test/CMakeLists.txt
+++ cfe/trunk/test/CMakeLists.txt
@@ -131,3 +131,12 @@
add_custom_target(clang-test)
add_dependencies(clang-test check-clang)
set_target_properties(clang-test PROPERTIES FOLDER "Clang tests")
+
+# FIXME: This logic can be removed once all buildbots have moved
+# debuginfo-test from clang/test to llvm/projects or monorepo.
+if(EXISTS debuginfo-tests)
+ message(WARNING "Including debuginfo-tests in clang/test is deprecated.
Move to llvm/projects or use monorepo.")
+ if(EXISTS debuginfo-tests/CMakeLists.txt)
+ add_subdirectory(debuginfo-tests)
+ endif()
+endif()
Index: cfe/trunk/test/lit.cfg.py
===================================================================
--- cfe/trunk/test/lit.cfg.py
+++ cfe/trunk/test/lit.cfg.py
@@ -58,12 +58,20 @@
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'),
]
+# FIXME: This logic can be removed once all buildbots have moved
+# debuginfo-test from clang/test to llvm/projects or monorepo.
+if os.path.exists(os.path.join(config.test_source_root, 'debuginfo-tests')):
+ if os.path.isfile(
+ os.path.join(config.test_source_root, 'debuginfo-tests', 'lit.cfg.py')):
+ config.excludes.append('debuginfo-tests')
+ else:
+ tools.append(ToolSubst('%test_debuginfo', command=os.path.join(
+ config.llvm_src_root, 'utils', 'test_debuginfo.pl')))
+
if config.clang_examples:
tools.append('clang-interpreter')
Index: cfe/trunk/test/CMakeLists.txt
===================================================================
--- cfe/trunk/test/CMakeLists.txt
+++ cfe/trunk/test/CMakeLists.txt
@@ -131,3 +131,12 @@
add_custom_target(clang-test)
add_dependencies(clang-test check-clang)
set_target_properties(clang-test PROPERTIES FOLDER "Clang tests")
+
+# FIXME: This logic can be removed once all buildbots have moved
+# debuginfo-test from clang/test to llvm/projects or monorepo.
+if(EXISTS debuginfo-tests)
+ message(WARNING "Including debuginfo-tests in clang/test is deprecated. Move to llvm/projects or use monorepo.")
+ if(EXISTS debuginfo-tests/CMakeLists.txt)
+ add_subdirectory(debuginfo-tests)
+ endif()
+endif()
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
