Commit 70f7be2b authored by twanvl's avatar twanvl

don't die when invoking mse fails

parent 25703cc1
...@@ -39,7 +39,12 @@ sub run_script_test { ...@@ -39,7 +39,12 @@ sub run_script_test {
my $errfile = basename($script,".mse-script") . ".err"; my $errfile = basename($script,".mse-script") . ".err";
my $command = "$MAGICSETEDITOR --cli --quiet --script \"$script\" $args > \"$outfile\" 2> \"$errfile\""; my $command = "$MAGICSETEDITOR --cli --quiet --script \"$script\" $args > \"$outfile\" 2> \"$errfile\"";
print "$command\n"; print "$command\n";
`$command`; #`$command`;
my $errcode = system($command);
if ($errcode != 0) {
print "Invoking Magic Set Editor failed\n";
fail_current_test();
}
# Check for errors / warnings # Check for errors / warnings
check_for_errors($errfile, $ignore_locale_errors); check_for_errors($errfile, $ignore_locale_errors);
...@@ -64,13 +69,15 @@ sub run_export_test { ...@@ -64,13 +69,15 @@ sub run_export_test {
my $errfile = basename($set,".mse-set") . ".err"; my $errfile = basename($set,".mse-set") . ".err";
my $command = "$MAGICSETEDITOR --export \"$template\" \"$set\" \"$outfile\" 2> \"$errfile\""; my $command = "$MAGICSETEDITOR --export \"$template\" \"$set\" \"$outfile\" 2> \"$errfile\"";
print "$command\n"; print "$command\n";
if (system($command) != 0) { my $errcode = system($command);
die("Invoking magic set editor failed\n"); if ($errcode != 0) {
print "Invoking Magic Set Editor failed\n";
fail_current_test();
} }
# Check for errors / warnings # Check for errors / warnings
check_for_errors($errfile, $ignore_locale_errors); check_for_errors($errfile, $ignore_locale_errors);
# TODO: diff against expected output? # TODO: diff against expected output?
#my $expected = basename($script,".mse-script") . ".out.expected"; #my $expected = basename($script,".mse-script") . ".out.expected";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment