This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 4dbd32d02224616177686afd8733a4ad03d0c298 (commit)
via 45063cf754673b88dfac19d1017382eedebe50dc (commit)
via 0d7f16649d8eedf2c0ff0c3ae33c11d4fb00b2c6 (commit)
from ca6f06607b0b93781483eaf77c071c1584d32867 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4dbd32d02224616177686afd8733a4ad03d0c298
commit 4dbd32d02224616177686afd8733a4ad03d0c298
Merge: ca6f066 45063cf
Author: Bill Hoffman <bill.hoff...@kitware.com>
AuthorDate: Tue Mar 17 14:38:05 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Mar 17 14:38:05 2015 -0400
Merge topic 'ctest-repeat-until-fail' into next
45063cf7 Remove standalone CTest run until fail test.
0d7f1664 Add testing for repeat until fail command line option to ctest.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=45063cf754673b88dfac19d1017382eedebe50dc
commit 45063cf754673b88dfac19d1017382eedebe50dc
Author: Bill Hoffman <bill.hoff...@kitware.com>
AuthorDate: Tue Mar 17 14:36:43 2015 -0400
Commit: Bill Hoffman <bill.hoff...@kitware.com>
CommitDate: Tue Mar 17 14:36:43 2015 -0400
Remove standalone CTest run until fail test.
The test has been moved to the RunCMake style test.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 4300c7e..08765de 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2583,13 +2583,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
ADD_TEST_MACRO(CTestTestSerialOrder ${CMAKE_CTEST_COMMAND}
--output-on-failure -C "\${CTestTest_CONFIG}")
- add_test_macro(CTestTestRunUntilFail ${CMAKE_CTEST_COMMAND}
- --repeat-until-fail 4 -C "\${CTestTest_CONFIG}")
- set_tests_properties(CTestTestRunUntilFail PROPERTIES
- PASS_REGULAR_EXPRESSION
- "1/2.*Test #1:.* initialization.*Passed.*Test #2.*test1.*Failed"
- )
-
if(NOT BORLAND)
set(CTestLimitDashJ_CTEST_OPTIONS --force-new-ctest-process)
add_test_macro(CTestLimitDashJ ${CMAKE_CTEST_COMMAND} -j 4
diff --git a/Tests/CTestTestRunUntilFail/CMakeLists.txt
b/Tests/CTestTestRunUntilFail/CMakeLists.txt
deleted file mode 100644
index 62f4814..0000000
--- a/Tests/CTestTestRunUntilFail/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-cmake_minimum_required(VERSION 2.8.12)
-project(CTestTestRunUntilFail)
-enable_testing()
-set(TEST_OUTPUT_FILE "${CMAKE_CURRENT_BINARY_DIR}/test_output.txt")
-add_test(NAME initialization
- COMMAND ${CMAKE_COMMAND}
- "-DTEST_OUTPUT_FILE=${TEST_OUTPUT_FILE}"
- -P "${CMAKE_CURRENT_SOURCE_DIR}/init.cmake")
-add_test(NAME test1
- COMMAND ${CMAKE_COMMAND}
- "-DTEST_OUTPUT_FILE=${TEST_OUTPUT_FILE}"
- -P "${CMAKE_CURRENT_SOURCE_DIR}/test1.cmake")
-set_tests_properties(test1 PROPERTIES DEPENDS "initialization")
diff --git a/Tests/CTestTestRunUntilFail/init.cmake
b/Tests/CTestTestRunUntilFail/init.cmake
deleted file mode 100644
index 560fb5e..0000000
--- a/Tests/CTestTestRunUntilFail/init.cmake
+++ /dev/null
@@ -1 +0,0 @@
-file(WRITE "${TEST_OUTPUT_FILE}" "0")
diff --git a/Tests/CTestTestRunUntilFail/test1.cmake
b/Tests/CTestTestRunUntilFail/test1.cmake
deleted file mode 100644
index d7fafb8..0000000
--- a/Tests/CTestTestRunUntilFail/test1.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-message("TEST_OUTPUT_FILE = ${TEST_OUTPUT_FILE}")
-file(READ "${TEST_OUTPUT_FILE}" COUNT)
-message("COUNT= ${COUNT}")
-math(EXPR COUNT "${COUNT} + 1")
-file(WRITE "${TEST_OUTPUT_FILE}" "${COUNT}")
-if(${COUNT} EQUAL 2)
- message(FATAL_ERROR "this test fails on the 2nd run")
-endif()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d7f16649d8eedf2c0ff0c3ae33c11d4fb00b2c6
commit 0d7f16649d8eedf2c0ff0c3ae33c11d4fb00b2c6
Author: Bill Hoffman <bill.hoff...@kitware.com>
AuthorDate: Tue Mar 17 13:51:12 2015 -0400
Commit: Bill Hoffman <bill.hoff...@kitware.com>
CommitDate: Tue Mar 17 14:04:54 2015 -0400
Add testing for repeat until fail command line option to ctest.
This adds more complete testing. It checks that the output is
as expected when ctest is run on a project with several tests
including one that fails on the second run only.
diff --git a/Tests/RunCMake/CTestCommandLine/Build.cmake
b/Tests/RunCMake/CTestCommandLine/Build.cmake
new file mode 100644
index 0000000..4654416
--- /dev/null
+++ b/Tests/RunCMake/CTestCommandLine/Build.cmake
@@ -0,0 +1,15 @@
+enable_testing()
+
+set(TEST_OUTPUT_FILE "${CMAKE_CURRENT_BINARY_DIR}/test_output.txt")
+add_test(NAME initialization
+ COMMAND ${CMAKE_COMMAND}
+ "-DTEST_OUTPUT_FILE=${TEST_OUTPUT_FILE}"
+ -P "${CMAKE_CURRENT_SOURCE_DIR}/init.cmake")
+add_test(NAME test1
+ COMMAND ${CMAKE_COMMAND}
+ "-DTEST_OUTPUT_FILE=${TEST_OUTPUT_FILE}"
+ -P "${CMAKE_CURRENT_SOURCE_DIR}/test1.cmake")
+set_tests_properties(test1 PROPERTIES DEPENDS "initialization")
+
+add_test(hello ${CMAKE_COMMAND} -E echo hello)
+add_test(goodbye ${CMAKE_COMMAND} -E echo goodbye)
diff --git a/Tests/RunCMake/CTestCommandLine/CMakeLists.txt
b/Tests/RunCMake/CTestCommandLine/CMakeLists.txt
index 2843a51..2897109 100644
--- a/Tests/RunCMake/CTestCommandLine/CMakeLists.txt
+++ b/Tests/RunCMake/CTestCommandLine/CMakeLists.txt
@@ -1,5 +1,3 @@
cmake_minimum_required(VERSION 3.0)
project(${RunCMake_TEST} NONE)
include(${RunCMake_TEST}.cmake)
-add_test(hello ${CMAKE_COMMAND} -E echo hello)
-add_test(goodbye ${CMAKE_COMMAND} -E echo goodbye)
diff --git a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
index 7be07c1..916c7bc 100644
--- a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
@@ -6,3 +6,14 @@ run_cmake_command(repeat-until-fail-bad2 ${CMAKE_CTEST_COMMAND}
--repeat-until-fail foo)
run_cmake_command(repeat-until-fail-good ${CMAKE_CTEST_COMMAND}
--repeat-until-fail 2)
+# Use a single build tree for a few tests without cleaning.
+set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/Build-build)
+set(RunCMake_TEST_NO_CLEAN 1)
+file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+
+set(RunCMake_TEST_OPTIONS -DCMAKE_VERBOSE_MAKEFILE=1)
+run_cmake(Build)
+unset(RunCMake_TEST_OPTIONS)
+run_cmake_command(repeat-until-fail-tests ${CMAKE_CTEST_COMMAND}
+ --repeat-until-fail 3 )
diff --git a/Tests/RunCMake/CTestCommandLine/init.cmake
b/Tests/RunCMake/CTestCommandLine/init.cmake
new file mode 100644
index 0000000..13466e1
--- /dev/null
+++ b/Tests/RunCMake/CTestCommandLine/init.cmake
@@ -0,0 +1,3 @@
+# This is run by test initialization in Build.cmake with cmake -P
+# It creates TEST_OUTPUT_FILE with a 0 in it
+file(WRITE "${TEST_OUTPUT_FILE}" "0")
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-until-fail-tests-result.txt
b/Tests/RunCMake/CTestCommandLine/repeat-until-fail-tests-result.txt
new file mode 100644
index 0000000..45a4fb7
--- /dev/null
+++ b/Tests/RunCMake/CTestCommandLine/repeat-until-fail-tests-result.txt
@@ -0,0 +1 @@
+8
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-until-fail-tests-stderr.txt
b/Tests/RunCMake/CTestCommandLine/repeat-until-fail-tests-stderr.txt
new file mode 100644
index 0000000..ba4235d
--- /dev/null
+++ b/Tests/RunCMake/CTestCommandLine/repeat-until-fail-tests-stderr.txt
@@ -0,0 +1 @@
+Errors while running CTest
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-until-fail-tests-stdout.txt
b/Tests/RunCMake/CTestCommandLine/repeat-until-fail-tests-stdout.txt
new file mode 100644
index 0000000..2bfb4e5
--- /dev/null
+++ b/Tests/RunCMake/CTestCommandLine/repeat-until-fail-tests-stdout.txt
@@ -0,0 +1,30 @@
+^Test project .*/Tests/RunCMake/CTestCommandLine/Build-build
+ Start 1: initialization
+ Test #1: initialization ................... Passed [0-9.]+ sec
+ Start 1: initialization
+ Test #1: initialization ................... Passed [0-9.]+ sec
+ Start 1: initialization
+1/4 Test #1: initialization ................... Passed [0-9.]+ sec
+ Start 2: test1
+ Test #2: test1 ............................ Passed [0-9.]+ sec
+ Start 2: test1
+ Test #2: test1 ............................\*\*\*Failed [0-9.]+ sec
+ Start 3: hello
+ Test #3: hello ............................ Passed [0-9.]+ sec
+ Start 3: hello
+ Test #3: hello ............................ Passed [0-9.]+ sec
+ Start 3: hello
+3/4 Test #3: hello ............................ Passed [0-9.]+ sec
+ Start 4: goodbye
+ Test #4: goodbye .......................... Passed [0-9.]+ sec
+ Start 4: goodbye
+ Test #4: goodbye .......................... Passed [0-9.]+ sec
+ Start 4: goodbye
+4/4 Test #4: goodbye .......................... Passed [0-9.]+ sec
++
+75% tests passed, 1 tests failed out of 4
++
+Total Test time \(real\) = [0-9.]+ sec
++
+The following tests FAILED:
+[ ]+2 - test1 \(Failed\)$
diff --git a/Tests/RunCMake/CTestCommandLine/test1.cmake
b/Tests/RunCMake/CTestCommandLine/test1.cmake
new file mode 100644
index 0000000..d7e4538
--- /dev/null
+++ b/Tests/RunCMake/CTestCommandLine/test1.cmake
@@ -0,0 +1,13 @@
+# This is run by test test1 in Build.cmake with cmake -P
+# It reads the file TEST_OUTPUT_FILE and increments the number
+# found in the file by 1. When the number is 2, then the
+# code sends out a cmake error causing the test to fail
+# the second time it is run.
+message("TEST_OUTPUT_FILE = ${TEST_OUTPUT_FILE}")
+file(READ "${TEST_OUTPUT_FILE}" COUNT)
+message("COUNT= ${COUNT}")
+math(EXPR COUNT "${COUNT} + 1")
+file(WRITE "${TEST_OUTPUT_FILE}" "${COUNT}")
+if(${COUNT} EQUAL 2)
+ message(FATAL_ERROR "this test fails on the 2nd run")
+endif()
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeLists.txt | 7 -----
Tests/CTestTestRunUntilFail/init.cmake | 1 -
.../CTestCommandLine/Build.cmake} | 6 ++--
Tests/RunCMake/CTestCommandLine/CMakeLists.txt | 2 --
Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake | 11 +++++++
Tests/RunCMake/CTestCommandLine/init.cmake | 3 ++
.../repeat-until-fail-tests-result.txt | 1 +
.../repeat-until-fail-tests-stderr.txt | 1 +
.../repeat-until-fail-tests-stdout.txt | 30 ++++++++++++++++++++
.../CTestCommandLine}/test1.cmake | 5 ++++
10 files changed, 55 insertions(+), 12 deletions(-)
delete mode 100644 Tests/CTestTestRunUntilFail/init.cmake
rename Tests/{CTestTestRunUntilFail/CMakeLists.txt =>
RunCMake/CTestCommandLine/Build.cmake} (81%)
create mode 100644 Tests/RunCMake/CTestCommandLine/init.cmake
create mode 100644
Tests/RunCMake/CTestCommandLine/repeat-until-fail-tests-result.txt
create mode 100644
Tests/RunCMake/CTestCommandLine/repeat-until-fail-tests-stderr.txt
create mode 100644
Tests/RunCMake/CTestCommandLine/repeat-until-fail-tests-stdout.txt
rename Tests/{CTestTestRunUntilFail => RunCMake/CTestCommandLine}/test1.cmake
(51%)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
