Improve Interactive runner

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

diff --git a/lib/Gruntmaster/Daemon/Runner/Interactive.pm b/lib/Gruntmaster/Daemon/Runner/Interactive.pm
index 9118e154960cfc5d35a548576b51335fdc2d844d..da51380200c0addf58ae8c9bd2ce94da4dfacc5a 100644 (file)
--- a/lib/Gruntmaster/Daemon/Runner/Interactive.pm
+++ b/lib/Gruntmaster/Daemon/Runner/Interactive.pm
@@ -18,32 +18,31 @@ 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';
-
-       my $ret = fork // get_logger->logdie("Fork failed: $!");
-       if ($ret) {
-               try {
-                       $meta->{files}{prog}{run}->($meta->{files}{prog}{name}, fds => [qw/0 fifo1 1 >fifo2/], map {defined $meta->{$_} ? ($_ => $meta->{$_}) : () } qw/timeout mlimit/);
-               } catch {
-                       die $_
-               } finally {
-                       waitpid $ret, 0;
-               };
-               die [WA, "Wrong Answer"] if $?;
-       } else {
-               try {
-                       $meta->{files}{ver}{run}->($meta->{files}{ver}{name}, fds => [qw/1 >fifo1 0 fifo2 4 >result/], args => [$test], map {defined $meta->{$_} ? ($_ => $meta->{$_}) : () } qw/timeout mlimit/);
-               } catch {
-                       exit 1;
-               };
-               exit
-       }
+       mkfifo 'fifo1', 0600 or die "$!\n" unless -e 'fifo1';
+       mkfifo 'fifo2', 0600 or die "$!\n" unless -e 'fifo2';
+
+       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}, nonblocking => 1, fds => \@fds, map { $_ => $meta->{$_} } qw/timeout mlimit/);
+
+       my $fail;
+       @fds = $ENV{GRUNTMASTER_VM} ? qw,1 >/dev/ttyS1 0 /dev/ttyS1, : qw/1 >fifo1 0 fifo2/;
+       try {
+               $meta->{files}{ver}{run}->($meta->{files}{ver}{name}, fds => [@fds, qw,4 >result,], args => [$test], map { $_ => $meta->{$_} } qw/timeout mlimit/);
+       } catch {
+               $fail = [WA, 'Wrong Answer'];
+       };
+
+       try {
+               Gruntmaster::Daemon::Format::execlist_finish(prog => !$fail);
+       } catch {
+               $fail = $_;
+       };
 
        unlink 'fifo1';
        unlink 'fifo2';
 
-       scalar slurp 'result'
+       die $fail if $fail; ## no critic (RequireCarping)
+       scalar slurp 'result' or 'Ok'
 }
 
 1;