diff options
Diffstat (limited to 'test/CMakeLists.txt')
| -rw-r--r-- | test/CMakeLists.txt | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index ba5a0252349a3..7521a1d167bc4 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,13 +1,10 @@ -find_file(CLANG_TEST_RUNNER TestRunner.sh PATHS ${CMAKE_CURRENT_SOURCE_DIR} - DOC "Clang's regression testing script") -mark_as_advanced(CLANG_TEST_RUNNER) - set(CLANG_TEST_DIRECTORIES "Analysis" "CodeGen" "CodeGenCXX" "CodeGenObjC" "Coverage" + "CXX" "Driver" "FixIt" "Frontend" @@ -28,14 +25,20 @@ if(PYTHONINTERP_FOUND) get_target_property(LLVM_TOOLS_PATH clang RUNTIME_OUTPUT_DIRECTORY) set(TESTING_EXTRA_PATHS "${LLVM_TOOLS_PATH}/${CMAKE_CFG_INTDIR}:${LLVM_SOURCE_DIR}/test/Scripts") + set(CLANG_TEST_EXTRA_ARGS) + if (MSVC OR XCODE) + set(CLANG_TEST_EXTRA_ARGS "--no-progress-bar") + endif() set(all_testdirs) - foreach(testdir ${CLANG_TEST_DIRECTORIES}) + foreach(testdir ${CLANG_TEST_DIRECTORIES}) add_custom_target(clang-test-${testdir} ${PYTHON_EXECUTABLE} ${LLVM_SOURCE_DIR}/tools/clang/utils/test/MultiTestRunner.py - -s - "--path=${TESTING_EXTRA_PATHS}" - ${CMAKE_CURRENT_SOURCE_DIR}/${testdir}/ + "--path=${TESTING_EXTRA_PATHS}" + -s ${CLANG_TEST_EXTRA_ARGS} + --clang=${LLVM_TOOLS_PATH}/${CMAKE_CFG_INTDIR}/clang + --clang-cc=${LLVM_TOOLS_PATH}/${CMAKE_CFG_INTDIR}/clang-cc + ${CMAKE_CURRENT_SOURCE_DIR}/${testdir}/ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMENT "Running Clang regression tests in ${testdir}") @@ -46,6 +49,9 @@ if(PYTHONINTERP_FOUND) ${PYTHON_EXECUTABLE} ${LLVM_SOURCE_DIR}/tools/clang/utils/test/MultiTestRunner.py "--path=${TESTING_EXTRA_PATHS}" + -s ${CLANG_TEST_EXTRA_ARGS} + --clang=${LLVM_TOOLS_PATH}/${CMAKE_CFG_INTDIR}/clang + --clang-cc=${LLVM_TOOLS_PATH}/${CMAKE_CFG_INTDIR}/clang-cc ${all_testdirs} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS clang clang-cc |