Author: zturner Date: Mon Nov 20 13:41:36 2017 New Revision: 318697 URL: http://llvm.org/viewvc/llvm-project?rev=318697&view=rev Log: Resubmit "Refactor debuginfo-tests" again.
This was reverted due to the tests being run twice on some build bots. Each run had a slightly different configuration due to the way in which it was being invoked. This fixes the problem (albeit in a somewhat hacky way). Hopefully in the future we can get rid of the workflow of running debuginfo-tests as part of clang, and then this hack can go away. Modified: cfe/trunk/test/CMakeLists.txt cfe/trunk/test/lit.cfg.py Modified: cfe/trunk/test/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CMakeLists.txt?rev=318697&r1=318696&r2=318697&view=diff ============================================================================== --- cfe/trunk/test/CMakeLists.txt (original) +++ cfe/trunk/test/CMakeLists.txt Mon Nov 20 13:41:36 2017 @@ -88,6 +88,14 @@ 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 Modified: cfe/trunk/test/lit.cfg.py URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/lit.cfg.py?rev=318697&r1=318696&r2=318697&view=diff ============================================================================== --- cfe/trunk/test/lit.cfg.py (original) +++ cfe/trunk/test/lit.cfg.py Mon Nov 20 13:41:36 2017 @@ -58,8 +58,6 @@ tool_dirs = [config.clang_tools_dir, con 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'), ] _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits