llvm.org GIT mirror llvm / cbf08c7
[debuginfo-tests] Make debuginfo-tests work in a standard configuration. Previously, debuginfo-tests was expected to be checked out into clang/test and then the tests would automatically run as part of check-clang. This is not a standard workflow for handling external projects, and it brings with it some serious drawbacks such as the inability to depend on things other than clang, which we will need going forward. The goal of this patch is to migrate towards a more standard workflow. To ease the transition for build bot maintainers, this patch tries not to break the existing workflow, but instead simply deprecate it to give maintainers a chance to update the build infrastructure. Differential Revision: https://reviews.llvm.org/D39605 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@317925 91177308-0d34-0410-b5e6-96231b3b80d8 Zachary Turner 1 year, 8 months ago
3 changed file(s) with 19 addition(s) and 10 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" )
880880 endif()
881881
882882 if( LLVM_INCLUDE_TESTS )
883 if(EXISTS ${LLVM_MAIN_SRC_DIR}/projects/test-suite AND TARGET clang)
883 if(TARGET clang)
884884 include(LLVMExternalProjectUtils)
885 llvm_ExternalProject_Add(test-suite ${LLVM_MAIN_SRC_DIR}/projects/test-suite
886 USE_TOOLCHAIN
887 EXCLUDE_FROM_ALL
888 NO_INSTALL
889 ALWAYS_CLEAN)
885 if (EXISTS ${LLVM_MAIN_SRC_DIR}/projects/test-suite)
886 llvm_ExternalProject_Add(test-suite ${LLVM_MAIN_SRC_DIR}/projects/test-suite
887 USE_TOOLCHAIN
888 TOOLCHAIN_TOOLS clang lld clang-cl
889 EXCLUDE_FROM_ALL
890 NO_INSTALL
891 ALWAYS_CLEAN)
892 endif()
893
894 add_llvm_external_project(debuginfo-tests projects/debuginfo-tests)
890895 endif()
891896 add_subdirectory(utils/lit)
892897 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(