if the server doesn't output a logfile, the protocol file is not compared

with it! This makes tests without server (like for file://) smarter.
This commit is contained in:
Daniel Stenberg
2000-11-27 11:53:50 +00:00
parent 0e78911ce3
commit 3723c52057

View File

@@ -345,6 +345,9 @@ sub singletest {
next; next;
} }
# remove previous server output logfile
unlink($SERVERIN);
# name of the test # name of the test
open(N, "<$TESTDIR/name$NUMBER.txt") || open(N, "<$TESTDIR/name$NUMBER.txt") ||
print "** Couldn't read name on test $NUMBER\n"; print "** Couldn't read name on test $NUMBER\n";
@@ -464,6 +467,7 @@ sub singletest {
} }
if(-r $SERVERIN) {
if(! -r $PROT) { if(! -r $PROT) {
print "** Missing protocol file for test $NUMBER", print "** Missing protocol file for test $NUMBER",
", should be similar to $SERVERIN\n"; ", should be similar to $SERVERIN\n";
@@ -472,8 +476,8 @@ sub singletest {
# The strip pattern below is for stripping off User-Agent: since # The strip pattern below is for stripping off User-Agent: since
# that'll be different in all versions, and the lines in a # that'll be different in all versions, and the lines in a
# RFC1876-post that are randomly generated and therefore are doomed to # RFC1876-post that are randomly generated and therefore are
# always differ! # doomed to always differ!
# verify the sent request # verify the sent request
$res = compare($SERVERIN, $PROT, "protocol", $res = compare($SERVERIN, $PROT, "protocol",
@@ -481,6 +485,7 @@ sub singletest {
if($res) { if($res) {
return 1; return 1;
} }
}
# remove the stdout and stderr files # remove the stdout and stderr files
unlink($STDOUT); unlink($STDOUT);