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 6fc66c2b00631dc6b6207bbd22b9042f90f4d50a..42768582ff596077a7b4f851ed705fb28ab4abbd 100644 (file)
--- a/lib/Gruntmaster/Daemon/Runner/File.pm
+++ b/lib/Gruntmaster/Daemon/Runner/File.pm
@@ -3,31 +3,37 @@ 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_001";
+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/);
-  my $out = slurp 'output';
-  my $ok = $meta->{okfile}[$test - 1];
-
-  $out =~ s/^\s+//;
-  $ok  =~ s/^\s+//;
-  $out =~ s/\s+/ /;
-  $ok  =~ s/\s+/ /;
-  $out =~ s/\s+$//;
-  $ok  =~ s/\s+$//;
-
-  die [WA, "Wrong answer"] if $out ne $ok;
-  $meta->{tests}[$test - 1] // 0
+       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 { $_ => $meta->{$_} } qw/timeout olimit mlimit/);
+       my $out = slurp 'output';
+       my $ok;
+       if (exists $meta->{okfile}) { # uncoverable branch false
+               $ok = $meta->{okfile}[$test - 1]
+       } else {
+               $ok = slurp "/var/lib/gruntmasterd/pb/$meta->{problem}/$test.ok" # uncoverable statement
+       }
+
+       $out =~ s/^\s+//;
+       $ok  =~ s/^\s+//;
+       $out =~ s/\s+/ /g;
+       $ok  =~ s/\s+/ /g;
+       $out =~ s/\s+$//;
+       $ok  =~ s/\s+$//;
+
+       die [WA, 'Wrong answer'] if $out ne $ok; ## no critic (RequireCarping)
+       $meta->{tests}[$test - 1] // 0
 }
 
 1;
@@ -42,11 +48,16 @@ Gruntmaster::Daemon::Runner::File - Compare output with static text files
 =head1 SYNOPSIS
 
   use Gruntmaster::Daemon::Runner::File;
-  Gruntmaster::Daemon::Runner::File->run(5, $meta);
+  Gruntmaster::Daemon::Runner::File::run(5, $meta);
 
 =head1 DESCRIPTION
 
-Gruntmaster::Daemon::Runner::File is a runner which compares the program output for test C<$test> with C<< $meta->{tests}[$test - 1] >>. Before comparing, leading and trailing whitespace is removed, and sequences of whitespace are converted to a single space.
+Gruntmaster::Daemon::Runner::File is a runner which compares the program output for test C<$test> with a static output. Before comparing, leading and trailing whitespace is removed, and sequences of whitespace are converted to a single space.
+
+If C<< $meta->{okfile} >> exists, the output is compared to C<< $meta->{okfile}[$test - 1] >>.
+Otherwise, the output is compared to F<< /var/lib/gruntmasterd/pb/$meta->{problem}/$test.ok >>.
+
+If the two strings match, the verdict is C<< $meta->{tests}[$test - 1] >>. Otherwise, the verdict is C<[WA, "Wrong answer"]>.
 
 =head1 AUTHOR