diff options
| author | Douglas Gregor <dgregor@apple.com> | 2009-07-27 18:31:49 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2009-07-27 18:31:49 +0000 |
| commit | 1b03350b2349f18aac30e4dfcfcb2bd4e432c0ba (patch) | |
| tree | 78e8882f0646f6415ef33b2b40f454f9621aa27e | |
| parent | 65b90055dd30cfb83d8344ff62ed428257431be4 (diff) | |
Prepare CMake regression testing for Daniel's upcoming fix to the test runner
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@77223 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | test/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index d5e2327872..794e80b0b2 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -24,8 +24,6 @@ set(CLANG_TEST_DIRECTORIES include(FindPythonInterp) 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") @@ -35,7 +33,8 @@ if(PYTHONINTERP_FOUND) add_custom_target(clang-test-${testdir} ${PYTHON_EXECUTABLE} ${LLVM_SOURCE_DIR}/tools/clang/utils/test/MultiTestRunner.py - "--path=${TESTING_EXTRA_PATHS}" + "--path=${LLVM_TOOLS_PATH}/${CMAKE_CFG_INTDIR}" + "--path=${LLVM_SOURCE_DIR}/test/Scripts" -s ${CLANG_TEST_EXTRA_ARGS} --clang=${LLVM_TOOLS_PATH}/${CMAKE_CFG_INTDIR}/clang --clang-cc=${LLVM_TOOLS_PATH}/${CMAKE_CFG_INTDIR}/clang-cc @@ -49,7 +48,8 @@ if(PYTHONINTERP_FOUND) add_custom_target(clang-test ${PYTHON_EXECUTABLE} ${LLVM_SOURCE_DIR}/tools/clang/utils/test/MultiTestRunner.py - "--path=${TESTING_EXTRA_PATHS}" + "--path=${LLVM_TOOLS_PATH}/${CMAKE_CFG_INTDIR}" + "--path=${LLVM_SOURCE_DIR}/test/Scripts" -s ${CLANG_TEST_EXTRA_ARGS} --clang=${LLVM_TOOLS_PATH}/${CMAKE_CFG_INTDIR}/clang --clang-cc=${LLVM_TOOLS_PATH}/${CMAKE_CFG_INTDIR}/clang-cc |