X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon%2FRunner%2FVerifier.pm;h=0690ddcb4a33b1eb085a8af7463a775b504f0b55;hb=cedd5d682a2777c1c42875a3dfba892ebb293de3;hp=7111f6baadc6058ac46b01ab86f12cca48181c75;hpb=99d3711026b621247d46551b38f19c34f26342bd;p=gruntmaster-daemon.git diff --git a/lib/Gruntmaster/Daemon/Runner/Verifier.pm b/lib/Gruntmaster/Daemon/Runner/Verifier.pm index 7111f6b..0690ddc 100644 --- a/lib/Gruntmaster/Daemon/Runner/Verifier.pm +++ b/lib/Gruntmaster/Daemon/Runner/Verifier.pm @@ -5,25 +5,28 @@ use strict; use warnings; use Gruntmaster::Daemon::Constants qw/WA/; +use Gruntmaster::Daemon::Format qw/copy_to_vm copy_from_vm/; use File::Slurp qw/slurp/; use Log::Log4perl qw/get_logger/; use Try::Tiny; -our $VERSION = '5999.000_004'; +our $VERSION = '5999.000_005'; ################################################## 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/); + copy_to_vm 'input'; + $meta->{files}{prog}{run}->($meta->{files}{prog}{name}, fds => [qw/0 input 1 >output/], map { $_ => $meta->{$_} } qw/timeout olimit mlimit/); try { $meta->{files}{ver}{run}->($meta->{files}{ver}{name}, fds => [qw/0 input 3 output 1 >result/], args => [$test]); } catch { die [WA, 'Wrong answer'] ## no critic (RequireCarping) }; - scalar slurp 'result'; + copy_from_vm 'result'; + scalar slurp 'result' or 'Ok'; } 1;