diff options
| author | Zachary Turner <zturner@google.com> | 2017-11-21 01:20:28 +0000 |
|---|---|---|
| committer | Zachary Turner <zturner@google.com> | 2017-11-21 01:20:28 +0000 |
| commit | 79708b54f2c1043e28d8d2fb46bb9b416b4806d6 (patch) | |
| tree | e414f95fa9e059450522acb02aeb5934a051b5e1 /clang/test | |
| parent | f874bd67d810814f16cf1142ad00314f6dae332c (diff) | |
| download | bcm5719-llvm-79708b54f2c1043e28d8d2fb46bb9b416b4806d6.tar.gz bcm5719-llvm-79708b54f2c1043e28d8d2fb46bb9b416b4806d6.zip | |
Re-revert "Refactor debuginfo-tests."
This is still breaking greendragon.
At this point I give up until someone can fix the greendragon
bots, and I will probably abandon this effort in favor of using
a private github repository.
llvm-svn: 318722
Diffstat (limited to 'clang/test')
| -rw-r--r-- | clang/test/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | clang/test/lit.cfg.py | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/clang/test/CMakeLists.txt b/clang/test/CMakeLists.txt index 3bf69bf84b2..c1ac9e4f0f9 100644 --- a/clang/test/CMakeLists.txt +++ b/clang/test/CMakeLists.txt @@ -88,14 +88,6 @@ 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 d2f0491821d..39bdf36afd1 100644 --- a/clang/test/lit.cfg.py +++ b/clang/test/lit.cfg.py @@ -58,6 +58,8 @@ 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'), ] |
