X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon%2FRunner%2FInteractive.pm;h=45f4ae41ee1b089ba612c9f3c21519658ddb38fd;hb=9730b2ea37caef3958e1dfdfedae194cca8da9fc;hp=d16e08e12a4f7d6b894d942a851d2d86e872de05;hpb=3fa65372157835ebd1b9d286d18bd96cc832f756;p=gruntmaster-daemon.git

diff --git a/lib/Gruntmaster/Daemon/Runner/Interactive.pm b/lib/Gruntmaster/Daemon/Runner/Interactive.pm
index d16e08e..45f4ae4 100644
--- a/lib/Gruntmaster/Daemon/Runner/Interactive.pm
+++ b/lib/Gruntmaster/Daemon/Runner/Interactive.pm
@@ -6,6 +6,7 @@ use warnings;
 
 use File::Slurp qw/slurp/;
 use Gruntmaster::Daemon::Constants qw/WA/;
+use Gruntmaster::Daemon::Format qw/copy_from_vm/;
 use Log::Log4perl qw/get_logger/;
 use POSIX qw/mkfifo/;
 use Try::Tiny;
@@ -18,16 +19,13 @@ sub run{
 	my ($test, $meta) = @_;
 	get_logger->trace("Running on test $test...");
 
-	mkfifo 'fifo1', 0600 or die "$!\n" unless -e 'fifo1';
-	mkfifo 'fifo2', 0600 or die "$!\n" unless -e 'fifo2';
-
-	my @fds = $ENV{GRUNTMASTER_VM} ? qw,0 /dev/ttyS1 1 >/dev/ttyS1, : qw/0 fifo1 1 >fifo2/;
+	my @fds = $ENV{GRUNTMASTER_VM} ? qw,0 ../fifo1 1 >../fifo2, : qw/0 fifo1 1 >fifo2/;
 	$meta->{files}{prog}{run}->($meta->{files}{prog}{name}, nonblocking => 1, fds => \@fds, map { $_ => $meta->{$_} } qw/timeout mlimit/);
 
 	my $fail;
-	@fds = $ENV{GRUNTMASTER_VM} ? qw,1 >/dev/ttyS1 0 /dev/ttyS1, : qw/1 >fifo1 0 fifo2/;
+	@fds = $ENV{GRUNTMASTER_VM} ? qw,1 >../fifo1 0 ../fifo2, : qw/1 >fifo1 0 fifo2/;
 	try {
-		$meta->{files}{ver}{run}->($meta->{files}{ver}{name}, fds => [@fds, qw,4 >result,], args => [$test], map { $_ => $meta->{$_} } qw/timeout mlimit/);
+		$meta->{files}{ver}{run}->($meta->{files}{ver}{name}, fds => [@fds, qw,3 input 4 >result,], args => [$test], map { $_ => $meta->{$_} } qw/timeout mlimit/);
 	} catch {
 		$fail = [WA, 'Wrong Answer'];
 	};
@@ -38,10 +36,8 @@ sub run{
 		$fail = $_;
 	};
 
-	unlink 'fifo1';
-	unlink 'fifo2';
-
 	die $fail if $fail; ## no critic (RequireCarping)
+	copy_from_vm 'result';
 	scalar slurp 'result' or 'Ok'
 }