[Cmake-commits] [cmake-commits] zach.mullen committed CMakeLists.txt 1.112 1.113

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
Set new ctest tests to always run, whether CTEST_TEST_CTEST is enabled or not.  Changed parallel test to be portable.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.112
retrieving revision 1.113
diff -C 2 -d -r1.112 -r1.113
*** CMakeLists.txt	22 Sep 2009 16:05:54 -0000	1.112
--- CMakeLists.txt	23 Sep 2009 15:38:34 -0000	1.113
***************
*** 1031,1034 ****
--- 1031,1079 ----
    ENDIF(CTEST_TEST_UPDATE)
  
+   CONFIGURE_FILE(
+     "${CMake_SOURCE_DIR}/Tests/CTestTestFailure/testNoBuild.cmake.in"
+     "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testNoBuild.cmake"
+     @ONLY ESCAPE_QUOTES)
+   ADD_TEST(CTestTestNoBuild ${CMAKE_CTEST_COMMAND}
+     -S "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testNoBuild.cmake" -V
+     --output-log "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testOut1.log"
+     )
+   SET_TESTS_PROPERTIES(CTestTestNoBuild PROPERTIES
+     FAIL_REGULAR_EXPRESSION "Error" WILL_FAIL true)
+   
+   CONFIGURE_FILE(
+     "${CMake_SOURCE_DIR}/Tests/CTestTestFailure/testNoExe.cmake.in"
+     "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testNoExe.cmake"
+     @ONLY ESCAPE_QUOTES)
+   ADD_TEST(CTestTestNoExe ${CMAKE_CTEST_COMMAND}
+     -S "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testNoExe.cmake" -V
+     --output-log "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testOut2.log"
+     )
+   SET_TESTS_PROPERTIES(CTestTestNoExe PROPERTIES #DEPENDS CTestTestNoBuild
+     PASS_REGULAR_EXPRESSION "Could not find executable"
+     FAIL_REGULAR_EXPRESSION "SegFault")
+ 
+   CONFIGURE_FILE(
+     "${CMake_SOURCE_DIR}/Tests/CTestTestCrash/test.cmake.in"
+     "${CMake_BINARY_DIR}/Tests/CTestTestCrash/test.cmake"
+     @ONLY ESCAPE_QUOTES)
+   ADD_TEST(CTestTestCrash ${CMAKE_CTEST_COMMAND}
+     -S "${CMake_BINARY_DIR}/Tests/CTestTestCrash/test.cmake" -V
+     --output-log "${CMake_BINARY_DIR}/Tests/CTestTestCrash/testOutput.log"
+     )
+   SET_TESTS_PROPERTIES(CTestTestCrash PROPERTIES
+     PASS_REGULAR_EXPRESSION "SegFault")
+     
+   CONFIGURE_FILE(
+     "${CMake_SOURCE_DIR}/Tests/CTestTestParallel/test.cmake.in"
+     "${CMake_BINARY_DIR}/Tests/CTestTestParallel/test.cmake"
+     @ONLY ESCAPE_QUOTES)
+   ADD_TEST(CTestTestParallel ${CMAKE_CTEST_COMMAND}
+     -S "${CMake_BINARY_DIR}/Tests/CTestTestParallel/test.cmake" -V
+     --output-log "${CMake_BINARY_DIR}/Tests/CTestTestParallel/testOutput.log"
+     )
+   ADD_TEST(CTestTestShowOnly ${CMAKE_CTEST_COMMAND}
+     -N
+     )
    IF (CTEST_TEST_CTEST AND CMAKE_RUN_LONG_TESTS)
      CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestTest/test.cmake.in"
***************
*** 1051,1099 ****
        )
      
-     CONFIGURE_FILE(
-       "${CMake_SOURCE_DIR}/Tests/CTestTestFailure/testNoBuild.cmake.in"
-       "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testNoBuild.cmake"
-       @ONLY ESCAPE_QUOTES)
-     ADD_TEST(CTestTestNoBuild ${CMAKE_CTEST_COMMAND}
-       -S "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testNoBuild.cmake" -V
-       --output-log "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testOut1.log"
-       )
-     SET_TESTS_PROPERTIES(CTestTestNoBuild PROPERTIES
-       FAIL_REGULAR_EXPRESSION "Error" WILL_FAIL true)
-     
-     CONFIGURE_FILE(
-       "${CMake_SOURCE_DIR}/Tests/CTestTestFailure/testNoExe.cmake.in"
-       "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testNoExe.cmake"
-       @ONLY ESCAPE_QUOTES)
-     ADD_TEST(CTestTestNoExe ${CMAKE_CTEST_COMMAND}
-       -S "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testNoExe.cmake" -V
-       --output-log "${CMake_BINARY_DIR}/Tests/CTestTestFailure/testOut2.log"
-       )
-     SET_TESTS_PROPERTIES(CTestTestNoExe PROPERTIES #DEPENDS CTestTestNoBuild
-       PASS_REGULAR_EXPRESSION "Could not find executable"
-       FAIL_REGULAR_EXPRESSION "SegFault")
- 
-     CONFIGURE_FILE(
-       "${CMake_SOURCE_DIR}/Tests/CTestTestCrash/test.cmake.in"
-       "${CMake_BINARY_DIR}/Tests/CTestTestCrash/test.cmake"
-       @ONLY ESCAPE_QUOTES)
-     ADD_TEST(CTestTestCrash ${CMAKE_CTEST_COMMAND}
-       -S "${CMake_BINARY_DIR}/Tests/CTestTestCrash/test.cmake" -V
-       --output-log "${CMake_BINARY_DIR}/Tests/CTestTestCrash/testOutput.log"
-       )
-     SET_TESTS_PROPERTIES(CTestTestCrash PROPERTIES
-       PASS_REGULAR_EXPRESSION "SegFault")
-       
-     CONFIGURE_FILE(
-       "${CMake_SOURCE_DIR}/Tests/CTestTestParallel/test.cmake.in"
-       "${CMake_BINARY_DIR}/Tests/CTestTestParallel/test.cmake"
-       @ONLY ESCAPE_QUOTES)
-     ADD_TEST(CTestTestParallel ${CMAKE_CTEST_COMMAND}
-       -S "${CMake_BINARY_DIR}/Tests/CTestTestParallel/test.cmake" -V
-       --output-log "${CMake_BINARY_DIR}/Tests/CTestTestParallel/testOutput.log"
-       )
-     ADD_TEST(CTestTestShowOnly ${CMAKE_CTEST_COMMAND}
-       -N
-       )
      # these tests take a long time, make sure they have it
      # if timeouts have not already been set
--- 1096,1099 ----