GnumericTest.pm (gnumeric-1.12.49.tar.xz) | : | GnumericTest.pm (gnumeric-1.12.50.tar.xz) | ||
---|---|---|---|---|
skipping to change at line 309 | skipping to change at line 309 | |||
} | } | |||
} | } | |||
# ----------------------------------------------------------------------------- | # ----------------------------------------------------------------------------- | |||
sub sstest { | sub sstest { | |||
my $test = shift @_; | my $test = shift @_; | |||
my $expected = shift @_; | my $expected = shift @_; | |||
my $cmd = "earg ($sstest, $test); | my $cmd = "earg ($sstest, $test); | |||
print STDERR "# $cmd\n" if $verbose; | ||||
my $actual = `$cmd 2>&1`; | my $actual = `$cmd 2>&1`; | |||
my $err = $?; | my $err = $?; | |||
die "Failed command: $cmd\n" if $err; | die "Failed command: $cmd\n" if $err; | |||
my $ok; | my $ok; | |||
if (ref $expected) { | if (ref $expected) { | |||
local $_ = $actual; | local $_ = $actual; | |||
$ok = &$expected ($_); | $ok = &$expected ($_); | |||
if (!$ok) { | if (!$ok) { | |||
foreach (split ("\n", $actual)) { | foreach (split ("\n", $actual)) { | |||
skipping to change at line 812 | skipping to change at line 813 | |||
&report_skip ("file $file does not exist") unless -r $file; | &report_skip ("file $file does not exist") unless -r $file; | |||
my $xmlfile = fileparse ($file); | my $xmlfile = fileparse ($file); | |||
$xmlfile =~ s/\.[a-zA-Z0-9]+$/.xml/; | $xmlfile =~ s/\.[a-zA-Z0-9]+$/.xml/; | |||
unlink $xmlfile; | unlink $xmlfile; | |||
die "Cannot remove $xmlfile.\n" if -f $xmlfile; | die "Cannot remove $xmlfile.\n" if -f $xmlfile; | |||
&junkfile ($xmlfile); | &junkfile ($xmlfile); | |||
{ | { | |||
my $cmd = "earg ($ssindex, "--index", $file); | my $cmd = "earg ($ssindex, "--index", $file); | |||
print STDERR "# $cmd\n" if $verbose; | ||||
my $output = `$cmd 2>&1 >'$xmlfile'`; | my $output = `$cmd 2>&1 >'$xmlfile'`; | |||
my $err = $?; | my $err = $?; | |||
&dump_indented ($output); | &dump_indented ($output); | |||
die "Failed command: $cmd\n" if $err; | die "Failed command: $cmd\n" if $err; | |||
} | } | |||
my $parser = new XML::Parser ('Style' => 'Tree'); | my $parser = new XML::Parser ('Style' => 'Tree'); | |||
my $tree = $parser->parsefile ($xmlfile); | my $tree = $parser->parsefile ($xmlfile); | |||
&removejunk ($xmlfile); | &removejunk ($xmlfile); | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 2 lines changed or added |