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 ee0d5f1e984acfed8220bf474c5b32f583a584a8 (commit)
via fd0b03f2f7a807c1bf56a44a129fad4ede55fe4b (commit)
from ffcab9ba5822eec95d349d937b5cb11e7ca7c2a1 (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=ee0d5f1e984acfed8220bf474c5b32f583a584a8
commit ee0d5f1e984acfed8220bf474c5b32f583a584a8
Merge: ffcab9b fd0b03f
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Mar 17 11:32:41 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Mar 17 11:32:41 2015 -0400
Merge topic 'add_repeat_testing' into next
fd0b03f2 fixup! Add error checking to repeat until fail ctest option along
with tests.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd0b03f2f7a807c1bf56a44a129fad4ede55fe4b
commit fd0b03f2f7a807c1bf56a44a129fad4ede55fe4b
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Mar 17 10:21:40 2015 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Mar 17 11:31:47 2015 -0400
fixup! Add error checking to repeat until fail ctest option along with
tests.
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 5f094e0..6946a20 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -2011,14 +2011,15 @@ bool cmCTest::HandleCommandLineArguments(size_t &i,
{
if( i >= args.size() - 1)
{
- errormsg = "Usage: ctest --repeat-until-fail N";
+ errormsg = "'--repeat-until-fail' requires an argument";
return false;
}
i++;
long repeat = 1;
if(!cmSystemTools::StringToLong(args[i].c_str(), &repeat))
{
- errormsg = "Usage: ctest --repeat-until-fail N";
+ errormsg = "'--repeat-until-fail' given non-integer value '"
+ + args[i] + "'";
return false;
}
this->RepeatTests = repeat;
diff --git a/Tests/RunCMake/CTestCommandLine/CMakeLists.txt
b/Tests/RunCMake/CTestCommandLine/CMakeLists.txt
index 6610d46..2843a51 100644
--- a/Tests/RunCMake/CTestCommandLine/CMakeLists.txt
+++ b/Tests/RunCMake/CTestCommandLine/CMakeLists.txt
@@ -2,4 +2,4 @@ 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)
\ No newline at end of file
+add_test(goodbye ${CMAKE_COMMAND} -E echo goodbye)
diff --git a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
index f56db82..7be07c1 100644
--- a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
@@ -1,6 +1,6 @@
include(RunCMake)
-run_cmake_command(repeat-until-fail-bad ${CMAKE_CTEST_COMMAND}
+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)
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-until-fail-bad-stderr.txt
b/Tests/RunCMake/CTestCommandLine/repeat-until-fail-bad-stderr.txt
deleted file mode 100644
index 723291f..0000000
--- a/Tests/RunCMake/CTestCommandLine/repeat-until-fail-bad-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-CMake Error: Usage: ctest --repeat-until-fail N
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-until-fail-bad-result.txt
b/Tests/RunCMake/CTestCommandLine/repeat-until-fail-bad1-result.txt
similarity index 100%
rename from Tests/RunCMake/CTestCommandLine/repeat-until-fail-bad-result.txt
rename to Tests/RunCMake/CTestCommandLine/repeat-until-fail-bad1-result.txt
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-until-fail-bad1-stderr.txt
b/Tests/RunCMake/CTestCommandLine/repeat-until-fail-bad1-stderr.txt
new file mode 100644
index 0000000..5ea8816
--- /dev/null
+++ b/Tests/RunCMake/CTestCommandLine/repeat-until-fail-bad1-stderr.txt
@@ -0,0 +1 @@
+^CMake Error: '--repeat-until-fail' requires an argument$
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-until-fail-bad2-stderr.txt
b/Tests/RunCMake/CTestCommandLine/repeat-until-fail-bad2-stderr.txt
index 723291f..a79faae 100644
--- a/Tests/RunCMake/CTestCommandLine/repeat-until-fail-bad2-stderr.txt
+++ b/Tests/RunCMake/CTestCommandLine/repeat-until-fail-bad2-stderr.txt
@@ -1 +1 @@
-CMake Error: Usage: ctest --repeat-until-fail N
+^CMake Error: '--repeat-until-fail' given non-integer value 'foo'$
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-until-fail-good-result.txt
b/Tests/RunCMake/CTestCommandLine/repeat-until-fail-good-result.txt
deleted file mode 100644
index 573541a..0000000
--- a/Tests/RunCMake/CTestCommandLine/repeat-until-fail-good-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-until-fail-good-stderr.txt
b/Tests/RunCMake/CTestCommandLine/repeat-until-fail-good-stderr.txt
index eafba1c..a7c4b11 100644
--- a/Tests/RunCMake/CTestCommandLine/repeat-until-fail-good-stderr.txt
+++ b/Tests/RunCMake/CTestCommandLine/repeat-until-fail-good-stderr.txt
@@ -1 +1 @@
-No tests were found!!!
+^No tests were found!!!$
-----------------------------------------------------------------------
Summary of changes:
Source/cmCTest.cxx | 5 +++--
Tests/RunCMake/CTestCommandLine/CMakeLists.txt | 2 +-
Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake | 2 +-
Tests/RunCMake/CTestCommandLine/repeat-until-fail-bad-stderr.txt | 1 -
...ntil-fail-bad-result.txt => repeat-until-fail-bad1-result.txt} | 0
Tests/RunCMake/CTestCommandLine/repeat-until-fail-bad1-stderr.txt | 1 +
Tests/RunCMake/CTestCommandLine/repeat-until-fail-bad2-stderr.txt | 2 +-
Tests/RunCMake/CTestCommandLine/repeat-until-fail-good-result.txt | 1 -
Tests/RunCMake/CTestCommandLine/repeat-until-fail-good-stderr.txt | 2 +-
9 files changed, 8 insertions(+), 8 deletions(-)
delete mode 100644
Tests/RunCMake/CTestCommandLine/repeat-until-fail-bad-stderr.txt
rename Tests/RunCMake/CTestCommandLine/{repeat-until-fail-bad-result.txt =>
repeat-until-fail-bad1-result.txt} (100%)
create mode 100644
Tests/RunCMake/CTestCommandLine/repeat-until-fail-bad1-stderr.txt
delete mode 100644
Tests/RunCMake/CTestCommandLine/repeat-until-fail-good-result.txt
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
