tests: adjust file part behavior in test verify section.
When a <file> part is now specified with no contents at all, this will actually verify that the specified file has no contents at all. Previously file contents would be ignored.
This commit is contained in:
@@ -124,6 +124,25 @@ sub getpart {
|
||||
return @this; #empty!
|
||||
}
|
||||
|
||||
sub partexists {
|
||||
my ($section, $part)=@_;
|
||||
|
||||
my $inside = 0;
|
||||
|
||||
for(@xml) {
|
||||
if(!$inside && ($_ =~ /^ *\<$section/)) {
|
||||
$inside++;
|
||||
}
|
||||
elsif((1 == $inside) && ($_ =~ /^ *\<$part[ \>]/)) {
|
||||
return 1; # exists
|
||||
}
|
||||
elsif((1 == $inside) && ($_ =~ /^ *\<\/$section/)) {
|
||||
return 0; # does not exist
|
||||
}
|
||||
}
|
||||
return 0; # does not exist
|
||||
}
|
||||
|
||||
# Return entire document as list of lines
|
||||
sub getall {
|
||||
return @xml;
|
||||
|
||||
@@ -3499,7 +3499,7 @@ sub singletest {
|
||||
my $outputok;
|
||||
for my $partsuffix (('', '1', '2', '3', '4')) {
|
||||
my @outfile=getpart("verify", "file".$partsuffix);
|
||||
if(@outfile) {
|
||||
if(@outfile || partexists("verify", "file".$partsuffix) ) {
|
||||
# we're supposed to verify a dynamically generated file!
|
||||
my %hash = getpartattr("verify", "file".$partsuffix);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user