X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon%2FRunner%2FInteractive.pm;h=af1581e1fa805a89aee6ba8a4a1f41c9ceb14227;hp=1825fcdfa384bb3132afa7189b03e0c7983d7076;hb=34a91d9a841432323980cad110047f18bb7ce7d8;hpb=fdb99417bb13ca0418a5ec8d9e240e29565225c4

diff --git a/lib/Gruntmaster/Daemon/Runner/Interactive.pm b/lib/Gruntmaster/Daemon/Runner/Interactive.pm
index 1825fcd..af1581e 100644
--- a/lib/Gruntmaster/Daemon/Runner/Interactive.pm
+++ b/lib/Gruntmaster/Daemon/Runner/Interactive.pm
@@ -18,8 +18,8 @@ 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;
@@ -30,17 +30,17 @@ sub run{
 	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 $_
+			die $_ ## no critic (RequireCarping)
 		} finally {
 			waitpid $ret, 0;
 		};
-		die [WA, "Wrong Answer"] if $?;
+		die [WA, 'Wrong Answer'] if $?; ## no critic (RequireCarping)
 	} 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 +50,7 @@ sub run{
 	unlink 'fifo1';
 	unlink 'fifo2';
 
-	scalar slurp 'result'
+	scalar slurp 'result' or 'Ok'
 }
 
 1;