CTest: Consolidate '--repeat-* n' options as `--repeat *:n`

Combine `--repeat-until-fail`, `--repeat-until-pass`, and
`--repeat-after-timeout` to create a single `--repeat <mode>:<n>`
option.  Retain `--repeat-until-fail` too because that has been
available in previous releases.

22 files changed, 28 insertions, 40 deletions

diff --git a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
index 6a7fd3b..0953504 100644
--- a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
@@ -4,14 +4,26 @@ set(RunCMake_TEST_TIMEOUT 60)
 unset(ENV{CTEST_PARALLEL_LEVEL})
 unset(ENV{CTEST_OUTPUT_ON_FAILURE})
 
-run_cmake_command(repeat-until-pass-bad1
-  ${CMAKE_CTEST_COMMAND} --repeat-until-pass
+run_cmake_command(repeat-opt-bad1
+  ${CMAKE_CTEST_COMMAND} --repeat until-pass
   )
-run_cmake_command(repeat-until-pass-bad2
-  ${CMAKE_CTEST_COMMAND} --repeat-until-pass foo
+run_cmake_command(repeat-opt-bad2
+  ${CMAKE_CTEST_COMMAND} --repeat until-pass:foo
   )
-run_cmake_command(repeat-until-pass-good
-  ${CMAKE_CTEST_COMMAND} --repeat-until-pass 2
+run_cmake_command(repeat-opt-bad3
+  ${CMAKE_CTEST_COMMAND} --repeat until-fail:2 --repeat-until-fail 2
+  )
+run_cmake_command(repeat-opt-bad4
+  ${CMAKE_CTEST_COMMAND} --repeat-until-fail 2 --repeat until-fail:2
+  )
+run_cmake_command(repeat-opt-until-pass
+  ${CMAKE_CTEST_COMMAND} --repeat until-pass:2
+  )
+run_cmake_command(repeat-opt-until-fail
+  ${CMAKE_CTEST_COMMAND} --repeat until-fail:2
+  )
+run_cmake_command(repeat-opt-after-timeout
+  ${CMAKE_CTEST_COMMAND} --repeat after-timeout:2
   )
 
 run_cmake_command(repeat-until-fail-bad1
@@ -24,33 +36,13 @@ run_cmake_command(repeat-until-fail-good
   ${CMAKE_CTEST_COMMAND} --repeat-until-fail 2
   )
 
-run_cmake_command(repeat-after-timeout-bad1
-  ${CMAKE_CTEST_COMMAND} --repeat-after-timeout
-  )
-run_cmake_command(repeat-after-timeout-bad2
-  ${CMAKE_CTEST_COMMAND} --repeat-after-timeout foo
-  )
-run_cmake_command(repeat-after-timeout-good
-  ${CMAKE_CTEST_COMMAND} --repeat-after-timeout 2
-  )
-
-run_cmake_command(repeat-until-pass-and-fail
-  ${CMAKE_CTEST_COMMAND} --repeat-until-pass 2 --repeat-until-fail 2
-  )
-run_cmake_command(repeat-until-fail-and-pass
-  ${CMAKE_CTEST_COMMAND} --repeat-until-fail 2 --repeat-until-pass 2
-  )
-run_cmake_command(repeat-until-fail-and-timeout
-  ${CMAKE_CTEST_COMMAND} --repeat-until-fail 2 --repeat-after-timeout 2
-  )
-
 function(run_repeat_until_pass_tests)
   # Use a single build tree for a few tests without cleaning.
   set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/repeat-until-pass-build)
   run_cmake(repeat-until-pass-cmake)
   set(RunCMake_TEST_NO_CLEAN 1)
   run_cmake_command(repeat-until-pass-ctest
-    ${CMAKE_CTEST_COMMAND} -C Debug --repeat-until-pass 3
+    ${CMAKE_CTEST_COMMAND} -C Debug --repeat until-pass:3
     )
 endfunction()
 run_repeat_until_pass_tests()
@@ -61,7 +53,7 @@ function(run_repeat_after_timeout_tests)
   run_cmake(repeat-after-timeout-cmake)
   set(RunCMake_TEST_NO_CLEAN 1)
   run_cmake_command(repeat-after-timeout-ctest
-    ${CMAKE_CTEST_COMMAND} -C Debug --repeat-after-timeout 3
+    ${CMAKE_CTEST_COMMAND} -C Debug --repeat after-timeout:3
     )
 endfunction()
 run_repeat_after_timeout_tests()
@@ -72,10 +64,11 @@ function(run_repeat_until_fail_tests)
   run_cmake(repeat-until-fail-cmake)
   set(RunCMake_TEST_NO_CLEAN 1)
   run_cmake_command(repeat-until-fail-ctest
-    ${CMAKE_CTEST_COMMAND} -C Debug --repeat-until-fail 3
+    ${CMAKE_CTEST_COMMAND} -C Debug ${ARGN}
     )
 endfunction()
-run_repeat_until_fail_tests()
+run_repeat_until_fail_tests(--repeat-until-fail 3)
+run_repeat_until_fail_tests(--repeat until-fail:3)
 
 function(run_BadCTestTestfile)
   set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/BadCTestTestfile)
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-after-timeout-bad1-result.txt b/Tests/RunCMake/CTestCommandLine/repeat-after-timeout-bad1-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/CTestCommandLine/repeat-after-timeout-bad1-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-after-timeout-bad1-stderr.txt b/Tests/RunCMake/CTestCommandLine/repeat-after-timeout-bad1-stderr.txt
deleted file mode 100644
index aea92b8..0000000
--- a/Tests/RunCMake/CTestCommandLine/repeat-after-timeout-bad1-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^CMake Error: '--repeat-after-timeout' requires an argument$
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-after-timeout-bad2-result.txt b/Tests/RunCMake/CTestCommandLine/repeat-after-timeout-bad2-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/CTestCommandLine/repeat-after-timeout-bad2-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-after-timeout-bad2-stderr.txt b/Tests/RunCMake/CTestCommandLine/repeat-after-timeout-bad2-stderr.txt
deleted file mode 100644
index c5db55b..0000000
--- a/Tests/RunCMake/CTestCommandLine/repeat-after-timeout-bad2-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^CMake Error: '--repeat-after-timeout' given non-integer value 'foo'$
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-until-pass-good-stderr.txt b/Tests/RunCMake/CTestCommandLine/repeat-opt-after-timeout-stderr.txt
index a7c4b11..a7c4b11 100644
--- a/Tests/RunCMake/CTestCommandLine/repeat-until-pass-good-stderr.txt
+++ b/Tests/RunCMake/CTestCommandLine/repeat-opt-after-timeout-stderr.txt
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-until-pass-bad2-result.txt b/Tests/RunCMake/CTestCommandLine/repeat-opt-bad1-result.txt
index d00491f..d00491f 100644
--- a/Tests/RunCMake/CTestCommandLine/repeat-until-pass-bad2-result.txt
+++ b/Tests/RunCMake/CTestCommandLine/repeat-opt-bad1-result.txt
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-opt-bad1-stderr.txt b/Tests/RunCMake/CTestCommandLine/repeat-opt-bad1-stderr.txt
new file mode 100644
index 0000000..f6f3241
--- /dev/null
+++ b/Tests/RunCMake/CTestCommandLine/repeat-opt-bad1-stderr.txt
@@ -0,0 +1 @@
+^CMake Error: '--repeat' given invalid value 'until-pass'$
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-until-pass-bad1-result.txt b/Tests/RunCMake/CTestCommandLine/repeat-opt-bad2-result.txt
index d00491f..d00491f 100644
--- a/Tests/RunCMake/CTestCommandLine/repeat-until-pass-bad1-result.txt
+++ b/Tests/RunCMake/CTestCommandLine/repeat-opt-bad2-result.txt
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-opt-bad2-stderr.txt b/Tests/RunCMake/CTestCommandLine/repeat-opt-bad2-stderr.txt
new file mode 100644
index 0000000..2f9f32a
--- /dev/null
+++ b/Tests/RunCMake/CTestCommandLine/repeat-opt-bad2-stderr.txt
@@ -0,0 +1 @@
+^CMake Error: '--repeat' given invalid value 'until-pass:foo'$
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-until-pass-and-fail-result.txt b/Tests/RunCMake/CTestCommandLine/repeat-opt-bad3-result.txt
index d00491f..d00491f 100644
--- a/Tests/RunCMake/CTestCommandLine/repeat-until-pass-and-fail-result.txt
+++ b/Tests/RunCMake/CTestCommandLine/repeat-opt-bad3-result.txt
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-opt-bad3-stderr.txt b/Tests/RunCMake/CTestCommandLine/repeat-opt-bad3-stderr.txt
new file mode 100644
index 0000000..de4e11b
--- /dev/null
+++ b/Tests/RunCMake/CTestCommandLine/repeat-opt-bad3-stderr.txt
@@ -0,0 +1 @@
+^CMake Error: At most one '--repeat' option may be used\.$
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-until-fail-and-timeout-result.txt b/Tests/RunCMake/CTestCommandLine/repeat-opt-bad4-result.txt
index d00491f..d00491f 100644
--- a/Tests/RunCMake/CTestCommandLine/repeat-until-fail-and-timeout-result.txt
+++ b/Tests/RunCMake/CTestCommandLine/repeat-opt-bad4-result.txt
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-opt-bad4-stderr.txt b/Tests/RunCMake/CTestCommandLine/repeat-opt-bad4-stderr.txt
new file mode 100644
index 0000000..de4e11b
--- /dev/null
+++ b/Tests/RunCMake/CTestCommandLine/repeat-opt-bad4-stderr.txt
@@ -0,0 +1 @@
+^CMake Error: At most one '--repeat' option may be used\.$
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-after-timeout-good-stderr.txt b/Tests/RunCMake/CTestCommandLine/repeat-opt-until-fail-stderr.txt
index a7c4b11..a7c4b11 100644
--- a/Tests/RunCMake/CTestCommandLine/repeat-after-timeout-good-stderr.txt
+++ b/Tests/RunCMake/CTestCommandLine/repeat-opt-until-fail-stderr.txt
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-opt-until-pass-stderr.txt b/Tests/RunCMake/CTestCommandLine/repeat-opt-until-pass-stderr.txt
new file mode 100644
index 0000000..a7c4b11
--- /dev/null
+++ b/Tests/RunCMake/CTestCommandLine/repeat-opt-until-pass-stderr.txt
@@ -0,0 +1 @@
+^No tests were found!!!$
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-until-fail-and-pass-result.txt b/Tests/RunCMake/CTestCommandLine/repeat-until-fail-and-pass-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/CTestCommandLine/repeat-until-fail-and-pass-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-until-fail-and-pass-stderr.txt b/Tests/RunCMake/CTestCommandLine/repeat-until-fail-and-pass-stderr.txt
deleted file mode 100644
index 15ee3a9..0000000
--- a/Tests/RunCMake/CTestCommandLine/repeat-until-fail-and-pass-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^CMake Error: At most one '--repeat-\*' option may be used\.$
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-until-fail-and-timeout-stderr.txt b/Tests/RunCMake/CTestCommandLine/repeat-until-fail-and-timeout-stderr.txt
deleted file mode 100644
index 15ee3a9..0000000
--- a/Tests/RunCMake/CTestCommandLine/repeat-until-fail-and-timeout-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^CMake Error: At most one '--repeat-\*' option may be used\.$
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-until-pass-and-fail-stderr.txt b/Tests/RunCMake/CTestCommandLine/repeat-until-pass-and-fail-stderr.txt
deleted file mode 100644
index 15ee3a9..0000000
--- a/Tests/RunCMake/CTestCommandLine/repeat-until-pass-and-fail-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^CMake Error: At most one '--repeat-\*' option may be used\.$
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-until-pass-bad1-stderr.txt b/Tests/RunCMake/CTestCommandLine/repeat-until-pass-bad1-stderr.txt
deleted file mode 100644
index c6afb1d..0000000
--- a/Tests/RunCMake/CTestCommandLine/repeat-until-pass-bad1-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^CMake Error: '--repeat-until-pass' requires an argument$
diff --git a/Tests/RunCMake/CTestCommandLine/repeat-until-pass-bad2-stderr.txt b/Tests/RunCMake/CTestCommandLine/repeat-until-pass-bad2-stderr.txt
deleted file mode 100644
index cc3aed5..0000000
--- a/Tests/RunCMake/CTestCommandLine/repeat-until-pass-bad2-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^CMake Error: '--repeat-until-pass' given non-integer value 'foo'$