Add perlcritic test and make code comply

[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 affac1817f2d07d4ab6d121d272ab2124377f854..dfdf95b5982e93c4a540c555e1690f80db91c97e 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_002';
+our $VERSION = '5999.000_004';
 
 ##################################################
 
@@ -18,22 +18,29 @@ 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';
+
+       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 {
-                       $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 {defined $meta->{$_} ? ($_ => $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 {defined $meta->{$_} ? ($_ => $meta->{$_}) : () } qw/timeout mlimit/);
                } catch {
                        exit 1;
                };