diff options
| -rw-r--r-- | tests/FILEFORMAT | 2 | ||||
| -rwxr-xr-x | tests/runtests.pl | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/tests/FILEFORMAT b/tests/FILEFORMAT index 60af98877..1be923819 100644 --- a/tests/FILEFORMAT +++ b/tests/FILEFORMAT @@ -36,7 +36,7 @@ statistical/informational purposes. <reply> <data [nocheck="1"] [sendzero="yes"] [base64="yes"]> data to be sent to the client on its request and later verified that it arrived -safely. Set the nocheck=1 to prevent the test script to verify the arrival +safely. Set nocheck="1" to prevent the test script from verifying the arrival of this data. If the data contains 'swsclose' anywhere within the start and end tag, and diff --git a/tests/runtests.pl b/tests/runtests.pl index a868b2c3a..3c7fc882a 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -1957,13 +1957,11 @@ sub singletest { unlink($memdump); } + # create a (possibly-empty) file before starting the test my @inputfile=getpart("client", "file"); - if(@inputfile) { - # we need to generate a file before this test is invoked - my %fileattr = getpartattr("client", "file"); - - my $filename=$fileattr{'name'}; - + my %fileattr = getpartattr("client", "file"); + my $filename=$fileattr{'name'}; + if(@inputfile || $filename) { if(!$filename) { logmsg "ERROR: section client=>file has no name attribute\n"; return -1; |