projects
/
gruntmaster-daemon.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't check mkrun_runner arguments for definedness twice
[gruntmaster-daemon.git]
/
lib
/
Gruntmaster
/
Daemon
/
Runner
/
File.pm
diff --git
a/lib/Gruntmaster/Daemon/Runner/File.pm
b/lib/Gruntmaster/Daemon/Runner/File.pm
index a79500cd364cb01c68957790174fff0afc11aa53..42768582ff596077a7b4f851ed705fb28ab4abbd 100644
(file)
--- a/
lib/Gruntmaster/Daemon/Runner/File.pm
+++ b/
lib/Gruntmaster/Daemon/Runner/File.pm
@@
-3,25
+3,26
@@
package Gruntmaster::Daemon::Runner::File;
use 5.014000;
use strict;
use warnings;
use 5.014000;
use strict;
use warnings;
+use re '/s';
use Gruntmaster::Daemon::Constants qw/WA/;
use File::Slurp qw/slurp/;
use Log::Log4perl qw/get_logger/;
use Gruntmaster::Daemon::Constants qw/WA/;
use File::Slurp qw/slurp/;
use Log::Log4perl qw/get_logger/;
-our $VERSION =
"5999.000_004"
;
+our $VERSION =
'5999.000_004'
;
##################################################
sub run{
my ($test, $meta) = @_;
get_logger->trace("Running on test $test...");
##################################################
sub run{
my ($test, $meta) = @_;
get_logger->trace("Running on test $test...");
- $meta->{files}{prog}{run}->($meta->{files}{prog}{name}, fds => [qw/0 input 1 >output/], map {
defined $meta->{$_} ? ($_ => $meta->{$_}) : ()
} qw/timeout olimit mlimit/);
+ $meta->{files}{prog}{run}->($meta->{files}{prog}{name}, fds => [qw/0 input 1 >output/], map {
$_ => $meta->{$_}
} qw/timeout olimit mlimit/);
my $out = slurp 'output';
my $ok;
my $out = slurp 'output';
my $ok;
- if (exists $meta->{okfile}) {
+ if (exists $meta->{okfile}) {
# uncoverable branch false
$ok = $meta->{okfile}[$test - 1]
} else {
$ok = $meta->{okfile}[$test - 1]
} else {
- $ok = slurp "/var/lib/gruntmasterd/pb/$meta->{problem}/$test.ok"
+ $ok = slurp "/var/lib/gruntmasterd/pb/$meta->{problem}/$test.ok"
# uncoverable statement
}
$out =~ s/^\s+//;
}
$out =~ s/^\s+//;
@@
-31,7
+32,7
@@
sub run{
$out =~ s/\s+$//;
$ok =~ s/\s+$//;
$out =~ s/\s+$//;
$ok =~ s/\s+$//;
- die [WA,
"Wrong answer"] if $out ne $ok;
+ die [WA,
'Wrong answer'] if $out ne $ok; ## no critic (RequireCarping)
$meta->{tests}[$test - 1] // 0
}
$meta->{tests}[$test - 1] // 0
}
This page took
0.010231 seconds
and
4
git commands to generate.