Add contest support to filesystem infiles/okfiles

[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..7f67fb301a35a7b359c879a6c374bd5803e3bce6 100644 (file)
--- a/lib/Gruntmaster/Daemon/Runner/File.pm
+++ b/lib/Gruntmaster/Daemon/Runner/File.pm
@@ -17,7 +17,13 @@ sub run{
   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];
+  my $ok;
+  if (exists $meta->{okfile}) {
+         $ok = $meta->{okfile}[$test - 1]
+  } else {
+         my $ct = defined $Gruntmaster::Data::contest ? "ct/$Gruntmaster::Data::contest" : '';
+         $ok = slurp "/var/lib/gruntmasterd/$ct/pb/$meta->{problem}/$test.ok"
+  }
 
   $out =~ s/^\s+//;
   $ok  =~ s/^\s+//;