From: Zachary Turner Date: Tue, 21 Nov 2017 01:20:28 +0000 (+0000) Subject: Re-revert "Refactor debuginfo-tests." X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d1e5cb8ce43609913ebc976ce4131294f7633b4a;p=clang 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. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@318722 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 3bf69bf84b..c1ac9e4f0f 100644 --- a/test/CMakeLists.txt +++ b/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/test/lit.cfg.py b/test/lit.cfg.py index d2f0491821..39bdf36afd 100644 --- a/test/lit.cfg.py +++ b/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'), ]