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 aaaadd71de3e70c0c4558a0dab4989803efbcdd4..ed9a056f2aac09e5907a35f15a18d4b3c336f98a 100644 (file)
--- a/lib/Gruntmaster/Daemon/Runner/Interactive.pm
+++ b/lib/Gruntmaster/Daemon/Runner/Interactive.pm
@@ -10,7 +10,7 @@ use Log::Log4perl qw/get_logger/;
 use POSIX qw/mkfifo/;
 use Try::Tiny;
 
-our $VERSION = '5999.000_003';
+our $VERSION = '5999.000_004';
 
 ##################################################
 
@@ -18,22 +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';
+       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 {
-                       $meta->{files}{prog}{run}->($meta->{files}{prog}{name}, fds => [qw/0 fifo1 1 >fifo2/], map {defined $meta->{$_} ? ($_ => $meta->{$_}) : () } qw/timeout mlimit/);
+                       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 { $_ => $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 {
-                       $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/);
+                       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 { $_ => $meta->{$_} } qw/timeout mlimit/);
                } catch {
                        exit 1;
                };
@@ -43,7 +45,7 @@ sub run{
        unlink 'fifo1';
        unlink 'fifo2';
 
-       scalar slurp 'result'
+       scalar slurp 'result' or 'Ok'
 }
 
 1;