1
0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00

A <precheck> command is considered to have failed if it returns a non-zero

return code.  This way, if the precheck command can't be run at all for
whatever reason, it's treated as a precheck failure which causes the
test to be skipped.
This commit is contained in:
Dan Fandrich 2008-10-15 17:41:02 +00:00
parent 0ea1c28135
commit 357383159e
3 changed files with 12 additions and 3 deletions

View File

@ -6,6 +6,12 @@
Changelog Changelog
Daniel Fandrich (15 Oct 2008)
- A <precheck> command is considered to have failed if it returns a non-zero
return code. This way, if the precheck command can't be run at all for
whatever reason, it's treated as a precheck failure which causes the
test to be skipped.
Daniel Stenberg (15 Oct 2008) Daniel Stenberg (15 Oct 2008)
- John Wilkinson filed bug #2155496 - John Wilkinson filed bug #2155496
(http://curl.haxx.se/bug/view.cgi?id=2155496) pointing out an error case (http://curl.haxx.se/bug/view.cgi?id=2155496) pointing out an error case

View File

@ -176,9 +176,9 @@ restart servers.
<precheck> <precheck>
A command line that if set gets run by the test script before the test. If an A command line that if set gets run by the test script before the test. If an
output is displayed by the command, the test will be skipped and the output is displayed by the command or if the return code is non-zero, the test
(single-line) output will be displayed as reason for not running the test. will be skipped and the (single-line) output will be displayed as reason for
Variables are substituted as in the <command> section. not running the test. Variables are substituted as in the <command> section.
</precheck> </precheck>
<postcheck> <postcheck>

View File

@ -486,6 +486,7 @@ sub torture {
else { else {
$ret = runclient($testcmd); $ret = runclient($testcmd);
} }
#logmsg "$_ Returned " . $ret / 256 . "\n";
# Now clear the variable again # Now clear the variable again
$ENV{'CURL_MEMLIMIT'} = undef; $ENV{'CURL_MEMLIMIT'} = undef;
@ -1857,6 +1858,8 @@ sub singletest {
if($o[0]) { if($o[0]) {
$why = $o[0]; $why = $o[0];
chomp $why; chomp $why;
} elsif($?) {
$why = "precheck command error";
} }
logmsg "prechecked $cmd\n" if($verbose); logmsg "prechecked $cmd\n" if($verbose);
} }