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 55afd70e1560e860d3d8f0a479c882de790e2a24..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 re '/s';
 
 use Gruntmaster::Daemon::Constants qw/WA/;
 use File::Slurp qw/slurp/;
 use Log::Log4perl qw/get_logger/;
 
-our $VERSION = "5999.000_002";
+our $VERSION = '5999.000_004';
 
 ##################################################
 
 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;
-       if (exists $meta->{okfile}) {
+       if (exists $meta->{okfile}) { # uncoverable branch false
                $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+//;
@@ -31,7 +32,7 @@ sub run{
        $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
 }