aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tests/README15
-rwxr-xr-xtests/runtests.pl15
2 files changed, 22 insertions, 8 deletions
diff --git a/tests/README b/tests/README
index f0248e632..b1955c8a6 100644
--- a/tests/README
+++ b/tests/README
@@ -98,6 +98,21 @@ The cURL Test Suite
3 to 9. Any test numbers starting with ! are disabled, as are any test
numbers found in the file data/DISABLED (one per line).
+ When -s is not present, each successful test will display on one line the
+ test number and description and on the next line a set of flags, the test
+ result, current test sequence, total number of tests to be run and an
+ estimated amount of time to complete the test run. The flags consist of
+ these letters describing what is checked in this test:
+
+ s stdout
+ d data
+ u upload
+ p protocol
+ o output
+ e exit code
+ m memory
+ v valgrind
+
1.5 Shell startup scripts
Tests which use the ssh test server, SCP/SFTP/SOCKS tests, might be badly
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 386ed6faf..6055173c9 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -149,8 +149,8 @@ my $LOGDIR="log";
my $TESTDIR="$srcdir/data";
my $LIBDIR="./libtest";
my $UNITDIR="./unit";
+# TODO: change this to use server_inputfilename()
my $SERVERIN="$LOGDIR/server.input"; # what curl sent the server
-my $SERVER2IN="$LOGDIR/server2.input"; # what curl sent the second server
my $CURLLOG="$LOGDIR/curl.log"; # all command lines run
my $FTPDCMD="$LOGDIR/ftpserver.cmd"; # copy ftp server instructions here
my $SERVERLOGS_LOCK="$LOGDIR/serverlogs.lock"; # server logs advisor read lock
@@ -2868,7 +2868,7 @@ sub singletest {
$teststat[$testnum]=$why; # store reason for this test case
if(!$short) {
- printf "test %03d SKIPPED: $why\n", $testnum;
+ logmsg sprintf("test %03d SKIPPED: $why\n", $testnum);
}
timestampskippedevents($testnum);
@@ -2933,9 +2933,8 @@ sub singletest {
chomp $tool;
}
- # remove server output logfiles
+ # remove server output logfile
unlink($SERVERIN);
- unlink($SERVER2IN);
if(@ftpservercmd) {
# write the instructions to file
@@ -3039,7 +3038,7 @@ sub singletest {
}
if(! -f $CMDLINE) {
- print "The tool set in the test case for this: '$tool' does not exist\n";
+ logmsg "The tool set in the test case for this: '$tool' does not exist\n";
timestampskippedevents($testnum);
return -1;
}
@@ -3493,8 +3492,8 @@ sub singletest {
}
else {
if(!$short) {
- printf("\n%s returned $cmdres, when expecting %s\n",
- (!$tool)?"curl":$tool, $errorcode);
+ logmsg sprintf("\n%s returned $cmdres, when expecting %s\n",
+ (!$tool)?"curl":$tool, $errorcode);
}
logmsg " exit FAILED\n";
# timestamp test result verification end
@@ -3585,7 +3584,7 @@ sub singletest {
my $left=sprintf("remaining: %02d:%02d",
$estleft/60,
$estleft%60);
- printf "OK (%-3d out of %-3d, %s)\n", $count, $total, $left;
+ logmsg sprintf("OK (%-3d out of %-3d, %s)\n", $count, $total, $left);
# the test succeeded, remove all log files
if(!$keepoutfiles) {