X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon%2FRunner%2FInteractive.pm;h=ed9a056f2aac09e5907a35f15a18d4b3c336f98a;hp=1825fcdfa384bb3132afa7189b03e0c7983d7076;hb=0f817fa673bc9fb881c260d7667d71972492fa84;hpb=fdb99417bb13ca0418a5ec8d9e240e29565225c4 diff --git a/lib/Gruntmaster/Daemon/Runner/Interactive.pm b/lib/Gruntmaster/Daemon/Runner/Interactive.pm index 1825fcd..ed9a056 100644 --- a/lib/Gruntmaster/Daemon/Runner/Interactive.pm +++ b/lib/Gruntmaster/Daemon/Runner/Interactive.pm @@ -18,29 +18,24 @@ sub run{ my ($test, $meta) = @_; get_logger->trace("Running on test $test..."); - mkfifo 'fifo1', 0600 or die $! unless -e 'fifo1'; - mkfifo 'fifo2', 0600 or die $! unless -e 'fifo2'; - - if ($test == 1 && $ENV{GRUNTMASTER_VM}) { - exec 'cat ver.in' if fork; - exec 'cat prog.in' if fork; - } + mkfifo 'fifo1', 0600 or die "$!\n" unless -e 'fifo1'; + mkfifo 'fifo2', 0600 or die "$!\n" unless -e 'fifo2'; my $ret = fork // get_logger->logdie("Fork failed: $!"); if ($ret) { try { my @fds = $ENV{GRUNTMASTER_VM} ? qw,0 /dev/ttyS1 1 >/dev/ttyS1, : qw/0 fifo1 1 >fifo2/; - $meta->{files}{prog}{run}->($meta->{files}{prog}{name}, fds => \@fds, map {defined $meta->{$_} ? ($_ => $meta->{$_}) : () } qw/timeout mlimit/); + $meta->{files}{prog}{run}->($meta->{files}{prog}{name}, fds => \@fds, map { $_ => $meta->{$_} } qw/timeout mlimit/); } catch { - die $_ + die $_ ## no critic (RequireCarping) } finally { waitpid $ret, 0; }; - die [WA, "Wrong Answer"] if $?; + die [WA, 'Wrong Answer'] if $?; ## no critic (RequireCarping) } else { try { my @fds = $ENV{GRUNTMASTER_VM} ? qw,1 >/dev/ttyS1 0 /dev/ttyS1, : qw/1 >fifo1 0 fifo2/; - $meta->{files}{ver}{run}->($meta->{files}{ver}{name}, fds => [@fds, qw,4 >result,], args => [$test], map {defined $meta->{$_} ? ($_ => $meta->{$_}) : () } qw/timeout mlimit/); + $meta->{files}{ver}{run}->($meta->{files}{ver}{name}, fds => [@fds, qw,4 >result,], args => [$test], map { $_ => $meta->{$_} } qw/timeout mlimit/); } catch { exit 1; }; @@ -50,7 +45,7 @@ sub run{ unlink 'fifo1'; unlink 'fifo2'; - scalar slurp 'result' + scalar slurp 'result' or 'Ok' } 1;