[cmake-commits] king committed CMakeLists.txt 1.47 1.48

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests
In directory public:/mounts/ram/cvs-serv22831/Tests

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: Combine all dependency* tests into one Dependency test.  Add more difficult test cases.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- CMakeLists.txt	1 Feb 2008 21:17:06 -0000	1.47
+++ CMakeLists.txt	6 Feb 2008 19:52:12 -0000	1.48
@@ -418,68 +418,17 @@
     --test-command TestDriverTest subdir/test3
     )
 
-  ADD_TEST(dependency_w_libout  ${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}
+  ADD_TEST(Dependency ${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