From: Marius Gavrilescu <marius@ieval.ro>
Date: Fri, 31 Jan 2014 13:17:06 +0000 (+0200)
Subject: Fix interactive runner
X-Git-Tag: 5999.000_001~22
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=2d67a3e68e77b9f85e324b1b5e974758e70e938a;p=gruntmaster-daemon.git

Fix interactive runner
---

diff --git a/lib/Gruntmaster/Daemon/Runner/Interactive.pm b/lib/Gruntmaster/Daemon/Runner/Interactive.pm
index 5edee04..9c4580f 100644
--- a/lib/Gruntmaster/Daemon/Runner/Interactive.pm
+++ b/lib/Gruntmaster/Daemon/Runner/Interactive.pm
@@ -15,13 +15,14 @@ use Try::Tiny;
 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 {