Only use pretests when contests are running

[gruntmaster-daemon.git] / lib / Gruntmaster / Daemon.pm

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index 9caa7dc9252123539425b93fbdf2a590040d39e6..048321e3acd15d1be05ac064f24074319765105b 100644 (file)
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -9,6 +9,7 @@ our $VERSION = '5999.000_004';
 use Gruntmaster::Daemon::Constants qw/ERR/;
 use Gruntmaster::Daemon::Format qw/prepare_files stopvms/;
 
+use File::Slurp qw/read_file/;
 use File::Temp qw/tempdir/;
 use JSON qw/decode_json encode_json/;
 use Sys::Hostname qw/hostname/;
@@ -21,6 +22,7 @@ use constant FORMAT_EXTENSION => {
        CPP => 'cpp',
        GCCGO => 'go',
        GOLANG => 'go',
+       GOLFSCRIPT => 'gs',
        HASKELL => 'hs',
        MONO => 'cs',
        JAVA => 'java',
@@ -63,6 +65,7 @@ sub process{
                for my $test (1 .. $testcnt) {
                        my $start_time = time;
                        my $result;
+                       unlink 'result';
                        try {
                                $generator->($test, $meta);
                                $result = $runner->($test, $meta);
@@ -75,8 +78,10 @@ sub process{
                        };
 
                        if (ref $result) {
-                               get_logger->trace("Test $test result is " . $result->[1]);
-                               push @full_results, {id => $test, result => $result->[0], result_text => $result->[1], time => time - $start_time}
+                               my $result_text = $result->[1];
+                               $result_text .= ': ' . read_file 'result' if -s 'result';
+                               get_logger->trace("Test $test result is " . $result_text);
+                               push @full_results, {id => $test, result => $result->[0], result_text => $result_text, time => time - $start_time}
                        } else {
                                get_logger->trace("Test $test result is $result");
                                push @full_results, {id => $test, result => 0, result_text => $result, time => time - $start_time}
@@ -113,8 +118,10 @@ sub process_job {
                },
                map { $_ => $job->problem->get_column($_) } qw/generator runner judge precnt testcnt timeout olimit/
        };
+       my $limit_override = $job->result_source->schema->limits->find($meta->{problem}, $job->format);
+       $meta->{timeout} = $limit_override->timeout if $limit_override;
        $meta->{tests} = decode_json $job->problem->tests if $meta->{runner} eq 'File';
-       delete $meta->{precnt} unless $job->contest;
+       delete $meta->{precnt} unless $job->contest && $job->contest->is_running;
        $meta->{testcnt} = $meta->{precnt} if $meta->{precnt};
 
        $meta->{files}{ver} = {