mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-01-18 14:04:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

runtests: add -o to run test cases in scrambled order

Browse Source 
... instead of numerical order.

Closes #1466
This commit is contained in:
Daniel Stenberg 2017-05-04 16:32:56 +02:00
parent 79bb0afddb
commit 067b8f2304
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/runtests.1
View File

@ -5,7 +5,7 @@
.\" * | (__| |_| | _ <| |___ .\" * | (__| |_| | _ <| |___
.\" * \___|\___/|_| \_\_____| .\" * \___|\___/|_| \_\_____|
.\" * .\" *
.\" * Copyright (C) 1998 - 2013, 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 .\" * This software is licensed as described in the file COPYING, which
.\" * you should have received as part of this distribution. The terms .\" * you should have received as part of this distribution. The terms
@ -71,6 +71,8 @@ detected. Useful for debugging.
Lists all test case names. Lists all test case names.
.IP "-n" .IP "-n"
Disable the check for and use of valgrind. Disable the check for and use of valgrind.
.IP "-o"
Run the tests in a scrambled, or randomized, order instead of sequentially.
.IP "-p" .IP "-p"
Prints out all files in "log/" to stdout when a test case fails. Very 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 practical when used in the automated and distributed tests since then the

29
tests/runtests.pl
View File

@ -194,7 +194,7 @@ my $pwd = getcwd(); # current working directory
my $start; my $start;
my $ftpchecktime=1; # time it took to verify our test FTP server my $ftpchecktime=1; # time it took to verify our test FTP server
my $scrambleorder;
my $stunnel = checkcmd("stunnel4") || checkcmd("tstunnel") || checkcmd("stunnel"); my $stunnel = checkcmd("stunnel4") || checkcmd("tstunnel") || checkcmd("stunnel");
my $valgrind = checktestcmd("valgrind"); my $valgrind = checktestcmd("valgrind");
my $valgrind_logfile="--logfile"; my $valgrind_logfile="--logfile";
@ -4870,6 +4870,10 @@ while(@ARGV) {
# have the servers display protocol output # have the servers display protocol output
$debugprotocol=1; $debugprotocol=1;
} }
elsif($ARGV[0] eq "-e") {
# run the tests cases event based if possible
$run_event_based=1;
}
elsif ($ARGV[0] eq "-g") { elsif ($ARGV[0] eq "-g") {
# run this test with gdb # run this test with gdb
$gdbthis=1; $gdbthis=1;
@ -4892,6 +4896,10 @@ while(@ARGV) {
# no valgrind # no valgrind
undef $valgrind; undef $valgrind;
} }
elsif ($ARGV[0] eq "-o") {
# execute in scrambled order
$scrambleorder=1;
}
elsif($ARGV[0] =~ /^-t(.*)/) { elsif($ARGV[0] =~ /^-t(.*)/) {
# torture # torture
$torture=1; $torture=1;
@ -4907,10 +4915,6 @@ while(@ARGV) {
# continue anyway, even if a test fail # continue anyway, even if a test fail
$anyway=1; $anyway=1;
} }
elsif($ARGV[0] eq "-e") {
# run the tests cases event based if possible
$run_event_based=1;
}
elsif($ARGV[0] eq "-p") { elsif($ARGV[0] eq "-p") {
$postmortem=1; $postmortem=1;
} }
@ -4958,12 +4962,14 @@ Usage: runtests.pl [options] [test selection(s)]
-bN use base port number N for test servers (default $base) -bN use base port number N for test servers (default $base)
-c path use this curl executable -c path use this curl executable
-d display server debug info -d display server debug info
-e event-based execution
-g run the test case with gdb -g run the test case with gdb
-gw run the test case with gdb as a windowed application -gw run the test case with gdb as a windowed application
-h this help text -h this help text
-k keep stdout and stderr files present after tests -k keep stdout and stderr files present after tests
-l list all test case names/descriptions -l list all test case names/descriptions
-n no valgrind -n no valgrind
-o scrambled order
-p print log file contents when a test fails -p print log file contents when a test fails
-r run time statistics -r run time statistics
-rf full run time statistics -rf full run time statistics
@ -5188,6 +5194,19 @@ else {
$TESTCASES = $verified; $TESTCASES = $verified;
} }
if($scrambleorder) {
# scramble the order of the test cases
my @rand;
while($TESTCASES) {
my @all = split(/ /, $TESTCASES);
my $r = rand @all;
push @rand, $all[$r];
$all[$r]="";
$TESTCASES = join(" ", @all);
}
$TESTCASES = join(" ", @rand);
}
####################################################################### #######################################################################
# Start the command line log # Start the command line log
# #