From 11bda81ead48d4b0b8870f212c47e2d12a04646e Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Mon, 13 Nov 2017 23:33:29 +0000 Subject: [PATCH] Revert "Update test_debuginfo.pl script to point to new tree location." This reverts the aforementioned patch and 2 subsequent follow-ups, as some buildbots are still failing 2 tests because of it. Investigation is ongoing into the cause of the failures. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@318112 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/CMakeLists.txt | 7 ------- test/lit.cfg.py | 2 ++ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index e001891384..c1ac9e4f0f 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -88,13 +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 - 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'), ] -- 2.40.0