llvm.org GIT mirror llvm / 2f8d9c0
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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@318697 91177308-0d34-0410-b5e6-96231b3b80d8 Zachary Turner 1 year, 9 months ago
4 changed file(s) with 20 addition(s) and 11 deletion(s). Raw diff Collapse all Expand all
109109 # LLVM_EXTERNAL_${project}_SOURCE_DIR using LLVM_ALL_PROJECTS
110110 # This allows an easy way of setting up a build directory for llvm and another
111111 # one for llvm+clang+... using the same sources.
112 set(LLVM_ALL_PROJECTS "clang;libcxx;libcxxabi;lldb;compiler-rt;lld;polly")
112 set(LLVM_ALL_PROJECTS "clang;libcxx;libcxxabi;lldb;compiler-rt;debuginfo-tests;lld;polly")
113113 set(LLVM_ENABLE_PROJECTS "" CACHE STRING
114114 "Semicolon-separated list of projects to build (${LLVM_ALL_PROJECTS}), or \"all\".")
115115 if( LLVM_ENABLE_PROJECTS STREQUAL "all" )
884884 endif()
885885
886886 if( LLVM_INCLUDE_TESTS )
887 if(EXISTS ${LLVM_MAIN_SRC_DIR}/projects/test-suite AND TARGET clang)
887 if(TARGET clang)
888888 include(LLVMExternalProjectUtils)
889 llvm_ExternalProject_Add(test-suite ${LLVM_MAIN_SRC_DIR}/projects/test-suite
890 USE_TOOLCHAIN
891 EXCLUDE_FROM_ALL
892 NO_INSTALL
893 ALWAYS_CLEAN)
889 if (EXISTS ${LLVM_MAIN_SRC_DIR}/projects/test-suite)
890 llvm_ExternalProject_Add(test-suite ${LLVM_MAIN_SRC_DIR}/projects/test-suite
891 USE_TOOLCHAIN
892 TOOLCHAIN_TOOLS clang lld clang-cl
893 EXCLUDE_FROM_ALL
894 NO_INSTALL
895 ALWAYS_CLEAN)
896 endif()
897
898 add_llvm_external_project(debuginfo-tests projects/debuginfo-tests)
894899 endif()
895900 add_subdirectory(utils/lit)
896901 add_subdirectory(test)
99 (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/libcxxabi) AND
1010 (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/libunwind) AND
1111 (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/test-suite) AND
12 (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/debuginfo-tests) AND
1213 (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/parallel-libs) AND
1314 (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/openmp))
1415 add_subdirectory(${entry})
2626 # For tests that require Windows to run.
2727 features.add('system-windows')
2828
29 lit_tools_dir = getattr(config, 'lit_tools_dir', None)
2930 # Seek sane tools in directories and set to $PATH.
30 path = self.lit_config.getToolsPath(config.lit_tools_dir,
31 path = self.lit_config.getToolsPath(lit_tools_dir,
3132 config.environment['PATH'],
3233 ['cmp.exe', 'grep.exe', 'sed.exe'])
3334 if path is not None:
412413 self.config.substitutions.append(
413414 ('%target_itanium_abi_host_triple', ''))
414415
415 self.config.substitutions.append(
416 ('%src_include_dir', self.config.clang_src_dir + '/include'))
416 clang_src_dir = getattr(self.config, 'clang_src_dir', None)
417 if clang_src_dir:
418 self.config.substitutions.append(
419 ('%src_include_dir', os.path.join(clang_src_dir, 'include')))
417420
418421 # FIXME: Find nicer way to prohibit this.
419422 self.config.substitutions.append(
5555 if (!$my_debugger) {
5656 if ($use_lldb) {
5757 my $path = dirname(Cwd::abs_path($0));
58 $my_debugger = "/usr/bin/env python $path/../tools/clang/test/debuginfo-tests/llgdb.py";
58 $my_debugger = "/usr/bin/env python $path/../tools/clang/test/debuginfo-tests/tests/llgdb.py";
5959 } else {
6060 $my_debugger = "gdb";
6161 }