From 989e4d4a31d094d1390b55a1888ac26765c18757 Mon Sep 17 00:00:00 2001 From: Patrick Monnerat Date: Sat, 2 Sep 2017 12:57:13 +0100 Subject: runtests.pl: allow tags in client section. This enables tests to create more than one file on the client side. --- tests/runtests.pl | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/tests/runtests.pl b/tests/runtests.pl index 5ffd8e7b0..7d260afcf 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -3808,23 +3808,25 @@ sub singletest { unlink($memdump); } - # create a (possibly-empty) file before starting the test - my @inputfile=getpart("client", "file"); - my %fileattr = getpartattr("client", "file"); - my $filename=$fileattr{'name'}; - if(@inputfile || $filename) { - if(!$filename) { - logmsg "ERROR: section client=>file has no name attribute\n"; - timestampskippedevents($testnum); - return -1; + # create (possibly-empty) files before starting the test + for my $partsuffix (('', '1', '2', '3', '4')) { + my @inputfile=getpart("client", "file".$partsuffix); + my %fileattr = getpartattr("client", "file".$partsuffix); + my $filename=$fileattr{'name'}; + if(@inputfile || $filename) { + if(!$filename) { + logmsg "ERROR: section client=>file has no name attribute\n"; + timestampskippedevents($testnum); + return -1; + } + my $fileContent = join('', @inputfile); + subVariables \$fileContent; +# logmsg "DEBUG: writing file " . $filename . "\n"; + open(OUTFILE, ">$filename"); + binmode OUTFILE; # for crapage systems, use binary + print OUTFILE $fileContent; + close(OUTFILE); } - my $fileContent = join('', @inputfile); - subVariables \$fileContent; -# logmsg "DEBUG: writing file " . $filename . "\n"; - open(OUTFILE, ">$filename"); - binmode OUTFILE; # for crapage systems, use binary - print OUTFILE $fileContent; - close(OUTFILE); } my %cmdhash = getpartattr("client", "command"); -- cgit v1.2.1