Improve VM support

[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 dfdf95b5982e93c4a540c555e1690f80db91c97e..ed9a056f2aac09e5907a35f15a18d4b3c336f98a 100644 (file)
--- a/lib/Gruntmaster/Daemon/Runner/Interactive.pm
+++ b/lib/Gruntmaster/Daemon/Runner/Interactive.pm
@@ -21,16 +21,11 @@ sub run{
        mkfifo 'fifo1', 0600 or die "$!\n" unless -e 'fifo1';
        mkfifo 'fifo2', 0600 or die "$!\n" unless -e 'fifo2';
 
-       if ($test == 1 && $ENV{GRUNTMASTER_VM}) {
-               exec 'cat <prog.out >ver.in' if fork;
-               exec 'cat <ver.out >prog.in' if fork;
-       }
-
        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 $_ ## no critic (RequireCarping)
                } finally {
@@ -40,7 +35,7 @@ sub run{
        } 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;