X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon%2FRunner%2FInteractive.pm;h=2d2fe91cbe800be381aa8a681875c8674bc3f5ca;hp=5edee04ea2055f533e92d53a3754bf4b98ffe6d5;hb=bc3729599a66921e1efd9f801222e814c626ea76;hpb=5c5cd38ad5b9e3c2b331564bc0b23e9167b7d07a diff --git a/lib/Gruntmaster/Daemon/Runner/Interactive.pm b/lib/Gruntmaster/Daemon/Runner/Interactive.pm index 5edee04..2d2fe91 100644 --- a/lib/Gruntmaster/Daemon/Runner/Interactive.pm +++ b/lib/Gruntmaster/Daemon/Runner/Interactive.pm @@ -10,18 +10,21 @@ use Log::Log4perl qw/get_logger/; use POSIX qw/mkfifo/; use Try::Tiny; +our $VERSION = '5999-TRIAL'; + ################################################## sub run{ my ($test, $meta) = @_; get_logger->trace("Running on test $test..."); - my $ret = fork // get_logger->logdie("Fork failed: $!"); 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) { $meta->{files}{prog}{run}->($meta->{files}{prog}{name}, fds => [qw/0 fifo1 1 >fifo2/], map {defined $meta->{$_} ? ($_ => $meta->{$_}) : () } qw/timeout mlimit/); - wait; + waitpid $ret, 0; die [WA, "Wrong Answer"] if $?; } else { try { @@ -35,5 +38,4 @@ sub run{ scalar slurp 'result' } -1; -__END__ +1