diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2010-12-16 21:50:16 (GMT) |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2010-12-16 21:50:47 (GMT) |
| commit | 7679f9fab099e729b61320927a9e0b8d03546f7f (patch) | |
| tree | faa70a89b54d074a3fa4afd9d02b0f98754d0931 | |
| parent | d95f817f77378021a067f9f2b4f286a12acb6cd8 (diff) | |
| download | CMake-7679f9fab099e729b61320927a9e0b8d03546f7f.zip CMake-7679f9fab099e729b61320927a9e0b8d03546f7f.tar.gz CMake-7679f9fab099e729b61320927a9e0b8d03546f7f.tar.bz2 | |
Rename WorkingDirectory test
| -rw-r--r-- | Tests/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | Tests/TestsWorkingDirectory/CMakeLists.txt (renamed from Tests/WorkingDirectory/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | Tests/TestsWorkingDirectory/main.cxx (renamed from Tests/WorkingDirectory/main.cxx) | 0 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 8c89be5..0e1edfc 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1084,18 +1084,18 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleGeneratorTest") ENDIF(APPLE AND CTEST_TEST_CPACK) - ADD_TEST(WorkingDirectory ${CMAKE_CTEST_COMMAND} + ADD_TEST(TestsWorkingDirectory ${CMAKE_CTEST_COMMAND} --build-and-test - "${CMake_SOURCE_DIR}/Tests/WorkingDirectory" - "${CMake_BINARY_DIR}/Tests/WorkingDirectory" + "${CMake_SOURCE_DIR}/Tests/TestsWorkingDirectory" + "${CMake_BINARY_DIR}/Tests/TestsWorkingDirectory" --build-generator ${CMAKE_TEST_GENERATOR} - --build-project WorkingDirectoryProj + --build-project TestsWorkingDirectoryProj --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} - --build-exe-dir "${CMake_BINARY_DIR}/Tests/WorkingDirectory" + --build-exe-dir "${CMake_BINARY_DIR}/Tests/TestsWorkingDirectory" --force-new-ctest-process --test-command ${CMAKE_CTEST_COMMAND} -V ) - LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/WorkingDirectory") + LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/TestsWorkingDirectory") # Make sure CTest can handle a test with no newline in output. ADD_TEST(CTest.NoNewline diff --git a/Tests/WorkingDirectory/CMakeLists.txt b/Tests/TestsWorkingDirectory/CMakeLists.txt index 5fbcd2a..5fbcd2a 100644 --- a/Tests/WorkingDirectory/CMakeLists.txt +++ b/Tests/TestsWorkingDirectory/CMakeLists.txt diff --git a/Tests/WorkingDirectory/main.cxx b/Tests/TestsWorkingDirectory/main.cxx index 6636da0..6636da0 100644 --- a/Tests/WorkingDirectory/main.cxx +++ b/Tests/TestsWorkingDirectory/main.cxx |