Skip to content

Commit

Permalink
[debuginfo-tests] Add support for moving debuginfo-tests from clang/t…
Browse files Browse the repository at this point in the history
…est to llvm/projects or monorepo.

Summary:
The new version of debuginfo-tests will have it's own
lit.cfg.py file which is incompatible with the one in clang/test.
This change supports both the old and new versions, and can be used
until the bots actually move debuginfo-tests to either clang/test or
the monorepo.

This is a prerequisite for D40971.

Reviewers: zturner, aprantl

Subscribers: mgorny, JDevlieghere, llvm-commits, cfe-commits

Differential Revision: https://reviews.llvm.org/D41055

llvm-svn: 320494
  • Loading branch information
donhinton committed Dec 12, 2017
1 parent 1a3b8fd commit f55db9c
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 2 deletions.
9 changes: 9 additions & 0 deletions clang/test/CMakeLists.txt
Expand Up @@ -131,3 +131,12 @@ add_lit_testsuites(CLANG ${CMAKE_CURRENT_SOURCE_DIR}
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()
12 changes: 10 additions & 2 deletions clang/test/lit.cfg.py
Expand Up @@ -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')

Expand Down

0 comments on commit f55db9c

Please sign in to comment.