generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

runtests.pl: Use logmsg more consistently

Browse Source
This commit is contained in:
Dan Fandrich
2011-12-31 00:49:34 -08:00
parent 90343c76c6
commit 9e3f8c4850
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/README
View File

@@ -98,6 +98,21 @@ The cURL Test Suite
3 to 9. Any test numbers starting with ! are disabled, as are any test 3 to 9. Any test numbers starting with ! are disabled, as are any test
numbers found in the file data/DISABLED (one per line). 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 1.5 Shell startup scripts
Tests which use the ssh test server, SCP/SFTP/SOCKS tests, might be badly Tests which use the ssh test server, SCP/SFTP/SOCKS tests, might be badly

15
tests/runtests.pl
View File

@@ -149,8 +149,8 @@ my $LOGDIR="log";
my $TESTDIR="$srcdir/data"; my $TESTDIR="$srcdir/data";
my $LIBDIR="./libtest"; my $LIBDIR="./libtest";
my $UNITDIR="./unit"; my $UNITDIR="./unit";
# TODO: change this to use server_inputfilename()
my $SERVERIN="$LOGDIR/server.input"; # what curl sent the server 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 $CURLLOG="$LOGDIR/curl.log"; # all command lines run
my $FTPDCMD="$LOGDIR/ftpserver.cmd"; # copy ftp server instructions here my $FTPDCMD="$LOGDIR/ftpserver.cmd"; # copy ftp server instructions here
my $SERVERLOGS_LOCK="$LOGDIR/serverlogs.lock"; # server logs advisor read lock 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 $teststat[$testnum]=$why; # store reason for this test case
if(!$short) { if(!$short) {
printf "test %03d SKIPPED: $why\n", $testnum; logmsg sprintf("test %03d SKIPPED: $why\n", $testnum);
} }
timestampskippedevents($testnum); timestampskippedevents($testnum);
@@ -2933,9 +2933,8 @@ sub singletest {
chomp $tool; chomp $tool;
} }
# remove server output logfiles # remove server output logfile
unlink($SERVERIN); unlink($SERVERIN);
unlink($SERVER2IN);
if(@ftpservercmd) { if(@ftpservercmd) {
# write the instructions to file # write the instructions to file
@@ -3039,7 +3038,7 @@ sub singletest {
} }
if(! -f $CMDLINE) { 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); timestampskippedevents($testnum);
return -1; return -1;
} }
@@ -3493,8 +3492,8 @@ sub singletest {
} }
else { else {
if(!$short) { if(!$short) {
printf("\n%s returned $cmdres, when expecting %s\n", logmsg sprintf("\n%s returned $cmdres, when expecting %s\n",
(!$tool)?"curl":$tool, $errorcode); (!$tool)?"curl":$tool, $errorcode);
} }
logmsg " exit FAILED\n"; logmsg " exit FAILED\n";
# timestamp test result verification end # timestamp test result verification end
@@ -3585,7 +3584,7 @@ sub singletest {
my $left=sprintf("remaining: %02d:%02d", my $left=sprintf("remaining: %02d:%02d",
$estleft/60, $estleft/60,
$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 # the test succeeded, remove all log files
if(!$keepoutfiles) { if(!$keepoutfiles) {