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 8c1e8b7cf477e0f11e374b435ff8e2e3374f0759 (commit)
via 427bd1d2457593a5f250d6ed8a2f88b367dac64d (commit)
from c52d65dbee29af9141d12cfd2f5c1c5b4ac5a3a5 (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=8c1e8b7cf477e0f11e374b435ff8e2e3374f0759
commit 8c1e8b7cf477e0f11e374b435ff8e2e3374f0759
Merge: c52d65d 427bd1d
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Mar 20 09:29:11 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Mar 20 09:29:11 2015 -0400
Merge topic 'ctest-repeat-until-fail' into next
427bd1d2 fixup! Add testing for repeat until fail command line option to
ctest.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=427bd1d2457593a5f250d6ed8a2f88b367dac64d
commit 427bd1d2457593a5f250d6ed8a2f88b367dac64d
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Mar 20 09:18:50 2015 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Mar 20 09:28:54 2015 -0400
fixup! Add testing for repeat until fail command line option to ctest.
diff --git a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
index 0e7d6d0..2e5156c 100644
--- a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
@@ -1,20 +1,25 @@
include(RunCMake)
-run_cmake_command(repeat-until-fail-bad1 ${CMAKE_CTEST_COMMAND}
- --repeat-until-fail)
-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}")
+run_cmake_command(repeat-until-fail-bad1
+ ${CMAKE_CTEST_COMMAND} --repeat-until-fail
+ )
+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
+ )
-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}
- -C Debug
- --repeat-until-fail 3 )
+function(run_repeat_until_fail_tests)
+ # Use a single build tree for a few tests without cleaning.
+ set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/repeat-until-fail-build)
+ set(RunCMake_TEST_NO_CLEAN 1)
+ file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+ file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+
+ run_cmake(repeat-until-fail-cmake)
+ run_cmake_command(repeat-until-fail-ctest
+ ${CMAKE_CTEST_COMMAND} -C Debug --repeat-until-fail 3
+ )
+endfunction()
+run_repeat_until_fail_tests()
diff --git a/Tests/RunCMake/CTestCommandLine/init.cmake
b/Tests/RunCMake/CTestCommandLine/init.cmake
index 13466e1..a900f67 100644
--- a/Tests/RunCMake/CTestCommandLine/init.cmake
+++ b/Tests/RunCMake/CTestCommandLine/init.cmake
@@ -1,3 +1,3 @@
-# This is run by test initialization in Build.cmake with cmake -P
-# It creates TEST_OUTPUT_FILE with a 0 in it
+# This is run by test initialization in repeat-until-fail-cmake.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/Build.cmake
b/Tests/RunCMake/CTestCommandLine/repeat-until-fail-cmake.cmake
similarity index 100%
rename from Tests/RunCMake/CTestCommandLine/Build.cmake
rename to Tests/RunCMake/CTestCommandLine/repeat-until-fail-cmake.cmake
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-until-fail-tests-result.txt
b/Tests/RunCMake/CTestCommandLine/repeat-until-fail-ctest-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestCommandLine/repeat-until-fail-tests-result.txt
rename to Tests/RunCMake/CTestCommandLine/repeat-until-fail-ctest-result.txt
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-until-fail-ctest-stderr.txt
b/Tests/RunCMake/CTestCommandLine/repeat-until-fail-ctest-stderr.txt
new file mode 100644
index 0000000..7593783
--- /dev/null
+++ b/Tests/RunCMake/CTestCommandLine/repeat-until-fail-ctest-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-ctest-stdout.txt
similarity index 90%
rename from Tests/RunCMake/CTestCommandLine/repeat-until-fail-tests-stdout.txt
rename to Tests/RunCMake/CTestCommandLine/repeat-until-fail-ctest-stdout.txt
index 2bfb4e5..0bc4f70 100644
--- a/Tests/RunCMake/CTestCommandLine/repeat-until-fail-tests-stdout.txt
+++ b/Tests/RunCMake/CTestCommandLine/repeat-until-fail-ctest-stdout.txt
@@ -1,4 +1,4 @@
-^Test project .*/Tests/RunCMake/CTestCommandLine/Build-build
+^Test project .*/Tests/RunCMake/CTestCommandLine/repeat-until-fail-build
Start 1: initialization
Test #1: initialization ................... Passed [0-9.]+ sec
Start 1: initialization
@@ -24,7 +24,7 @@
+
75% tests passed, 1 tests failed out of 4
+
-Total Test time \(real\) = [0-9.]+ sec
+Total Test time \(real\) = +[0-9.]+ sec
+
The following tests FAILED:
[ ]+2 - test1 \(Failed\)$
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-until-fail-tests-stderr.txt
b/Tests/RunCMake/CTestCommandLine/repeat-until-fail-tests-stderr.txt
deleted file mode 100644
index ba4235d..0000000
--- a/Tests/RunCMake/CTestCommandLine/repeat-until-fail-tests-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-Errors while running CTest
diff --git a/Tests/RunCMake/CTestCommandLine/test1.cmake
b/Tests/RunCMake/CTestCommandLine/test1.cmake
index d7e4538..eeae7a2 100644
--- a/Tests/RunCMake/CTestCommandLine/test1.cmake
+++ b/Tests/RunCMake/CTestCommandLine/test1.cmake
@@ -1,4 +1,4 @@
-# This is run by test test1 in Build.cmake with cmake -P
+# This is run by test test1 in repeat-until-fail-cmake.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
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake | 39 +++++++++++---------
Tests/RunCMake/CTestCommandLine/init.cmake | 4 +-
.../{Build.cmake => repeat-until-fail-cmake.cmake} | 0
...sult.txt => repeat-until-fail-ctest-result.txt} | 0
.../repeat-until-fail-ctest-stderr.txt | 1 +
...dout.txt => repeat-until-fail-ctest-stdout.txt} | 4 +-
.../repeat-until-fail-tests-stderr.txt | 1 -
Tests/RunCMake/CTestCommandLine/test1.cmake | 2 +-
8 files changed, 28 insertions(+), 23 deletions(-)
rename Tests/RunCMake/CTestCommandLine/{Build.cmake =>
repeat-until-fail-cmake.cmake} (100%)
rename Tests/RunCMake/CTestCommandLine/{repeat-until-fail-tests-result.txt =>
repeat-until-fail-ctest-result.txt} (100%)
create mode 100644
Tests/RunCMake/CTestCommandLine/repeat-until-fail-ctest-stderr.txt
rename Tests/RunCMake/CTestCommandLine/{repeat-until-fail-tests-stdout.txt =>
repeat-until-fail-ctest-stdout.txt} (90%)
delete mode 100644
Tests/RunCMake/CTestCommandLine/repeat-until-fail-tests-stderr.txt
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
