diff options
| author | Brad King <brad.king@kitware.com> | 2008-02-06 19:52:12 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-02-06 19:52:12 (GMT) |
| commit | 1cba430d1bcbf62f0d012cd2f243d57c54881c07 (patch) | |
| tree | f78d20d94730611c36b1bbd9cc3244cedf5ef233 /Tests/CMakeLists.txt | |
| parent | 0cb622a28b3d19e9681a315b5690c8aa496e83a4 (diff) | |
| download | CMake-1cba430d1bcbf62f0d012cd2f243d57c54881c07.zip CMake-1cba430d1bcbf62f0d012cd2f243d57c54881c07.tar.gz CMake-1cba430d1bcbf62f0d012cd2f243d57c54881c07.tar.bz2 | |
ENH: Combine all dependency* tests into one Dependency test. Add more difficult test cases.
Diffstat (limited to 'Tests/CMakeLists.txt')
| -rw-r--r-- | Tests/CMakeLists.txt | 57 |
1 files changed, 3 insertions, 54 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 8fc850f..895579c 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -418,68 +418,17 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel --test-command TestDriverTest subdir/test3 ) - ADD_TEST(dependency_w_libout ${CMAKE_CTEST_COMMAND} + ADD_TEST(Dependency ${CMAKE_CTEST_COMMAND} --build-and-test "${CMake_SOURCE_DIR}/Tests/Dependency" - "${CMake_BINARY_DIR}/Tests/Dependency/WithLibOut" - --build-exe-dir "${CMake_BINARY_DIR}/Tests/Dependency/WithLibOut/Exec" - --build-project Dependency - --build-generator ${CMAKE_TEST_GENERATOR} - --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} - --build-options - -DLIBRARY_OUTPUT_PATH:PATH=${CMake_BINARY_DIR}/Tests/Dependency/WithLibOut/Lib - --test-command exec - ) - - ADD_TEST(dependency_wo_lib_out ${CMAKE_CTEST_COMMAND} - --build-and-test - "${CMake_SOURCE_DIR}/Tests/Dependency" - "${CMake_BINARY_DIR}/Tests/Dependency/WOLibOut" - --build-exe-dir "${CMake_BINARY_DIR}/Tests/Dependency/WOLibOut/Exec" + "${CMake_BINARY_DIR}/Tests/Dependency" + --build-exe-dir "${CMake_BINARY_DIR}/Tests/Dependency/Exec" --build-generator ${CMAKE_TEST_GENERATOR} --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} --build-project Dependency --test-command exec ) - ADD_TEST(dependency2 ${CMAKE_CTEST_COMMAND} - --build-and-test - "${CMake_SOURCE_DIR}/Tests/Dependency" - "${CMake_BINARY_DIR}/Tests/Dependency/WithLibOut" - --build-exe-dir "${CMake_BINARY_DIR}/Tests/Dependency/WithLibOut/Exec2" - --build-generator ${CMAKE_TEST_GENERATOR} - --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} - --build-project Dependency - --build-options - -DLIBRARY_OUTPUT_PATH:PATH=${CMake_BINARY_DIR}/Tests/Dependency/WithLibOut/Lib - --test-command exec2 - ) - - ADD_TEST(dependency3 ${CMAKE_CTEST_COMMAND} - --build-and-test - "${CMake_SOURCE_DIR}/Tests/Dependency" - "${CMake_BINARY_DIR}/Tests/Dependency/WithLibOut" - --build-exe-dir "${CMake_BINARY_DIR}/Tests/Dependency/WithLibOut/Exec3" - --build-generator ${CMAKE_TEST_GENERATOR} - --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} - --build-project Dependency - --build-options - -DLIBRARY_OUTPUT_PATH:PATH=${CMake_BINARY_DIR}/Tests/Dependency/WithLibOut/Lib - --test-command exec3) - - ADD_TEST(dependency4 ${CMAKE_CTEST_COMMAND} - --build-and-test - "${CMake_SOURCE_DIR}/Tests/Dependency" - "${CMake_BINARY_DIR}/Tests/Dependency/WithLibOut" - --build-exe-dir "${CMake_BINARY_DIR}/Tests/Dependency/WithLibOut/Exec4" - --build-generator ${CMAKE_TEST_GENERATOR} - --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} - --build-project Dependency - --build-options - -DLIBRARY_OUTPUT_PATH:PATH=${CMake_BINARY_DIR}/Tests/Dependency/WithLibOut/Lib - --test-command exec4 - ) - IF("${CMAKE_SYSTEM_NAME}" MATCHES syllable) # RPATH isn't supported under Syllable, so the tests don't |