runtests: use -R for random order

Suggested-by: Dan Fandrich

diff --git a/tests/runtests.1 b/tests/runtests.1
index 02540c84be48cfbf917d132b92c43d88fea8e8cc..18ddce483700adc4a1952cd2017d8efe4fcd6095 100644 (file)
--- a/tests/runtests.1
+++ b/tests/runtests.1
@@ -71,13 +71,13 @@ detected. Useful for debugging.
 Lists all test case names.
 .IP "-n"
 Disable the check for and use of valgrind.
-.IP "-o"
-Run the tests in a scrambled, or randomized, order instead of sequentially.
 .IP "-p"
 Prints out all files in "log/" to stdout when a test case fails. Very
 practical when used in the automated and distributed tests since then the
 people checking the failures and the reasons for them might not have physical
 access to the machine and logs.
+.IP "-R"
+Run the tests in a scrambled, or randomized, order instead of sequentially.
 .IP "-r"
 Display run time statistics. (Requires Perl Time::HiRes module)
 .IP "-rf"

diff --git a/tests/runtests.pl b/tests/runtests.pl
index d3e4fbbccb10183d7585f8e7c377ee7fdbfc8968..68ff3933e6952b8010a166c300d04a5eba26987c 100755 (executable)
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -6,7 +6,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -4896,7 +4896,7 @@ while(@ARGV) {
         # no valgrind
         undef $valgrind;
     }
-    elsif ($ARGV[0] eq "-o") {
+    elsif ($ARGV[0] eq "-R") {
         # execute in scrambled order
         $scrambleorder=1;
     }
@@ -4969,8 +4969,8 @@ Usage: runtests.pl [options] [test selection(s)]
   -k       keep stdout and stderr files present after tests
   -l       list all test case names/descriptions
   -n       no valgrind
-  -o       scrambled order
   -p       print log file contents when a test fails
+  -R       scrambled order
   -r       run time statistics
   -rf      full run time statistics
   -s       short output