X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon%2FFormat.pm;h=6160a31e9460a08bba84bafb9f44eab524ffc89d;hp=a51b6cb66ea6fc6ce3bff0b6a123ca9404e480d9;hb=0f817fa673bc9fb881c260d7667d71972492fa84;hpb=99d3711026b621247d46551b38f19c34f26342bd

diff --git a/lib/Gruntmaster/Daemon/Format.pm b/lib/Gruntmaster/Daemon/Format.pm
index a51b6cb..6160a31 100644
--- a/lib/Gruntmaster/Daemon/Format.pm
+++ b/lib/Gruntmaster/Daemon/Format.pm
@@ -11,7 +11,6 @@ use File::Basename qw/fileparse/;
 use File::Slurp qw/read_file write_file/;
 use List::MoreUtils qw/natatime/;
 use Log::Log4perl qw/get_logger/;
-use POSIX qw/mkfifo/;
 use String::ShellQuote qw/shell_quote/;
 use Try::Tiny;
 
@@ -23,13 +22,13 @@ our @EXPORT_OK = qw/prepare_files stopvms/;
 our (%vm);
 
 sub runvm {
-	my ($name) = @_;
+	my ($name, $arg) = @_;
 	return unless $ENV{GRUNTMASTER_VM};
-	mkfifo "$name.in", 0600;
-	mkfifo "$name.out", 0600;
-	get_logger->trace("Starting VM $name");
+	my $cmd = $ENV{GRUNTMASTER_VM};
+	$cmd .= ' ' . $arg if $arg;
+	get_logger->trace("Starting VM $name ($cmd)");
 	$vm{$name} = Expect::Simple->new({
-		Cmd => "$ENV{GRUNTMASTER_VM} $name",
+		Cmd => $cmd,
 		Prompt => '# ',
 		DisconnectCmd => 'exit',
 		RawPty => 1,
@@ -52,6 +51,7 @@ sub execlist {
 			waitpid $ret, 0;
 		} else {
 			open STDOUT, '>', $er or die "Cannot open $er\n";
+			get_logger->trace("Running: gruntmaster-exec @args");
 			exec 'gruntmaster-exec', @args;
 		}
 	}
@@ -64,19 +64,6 @@ sub execlist {
 	die [$excode, $exmsg] if $excode > 0; ## no critic (RequireCarping)
 }
 
-sub command_and_args{
-	my ($format, $basename) = @_;
-
-	given($format) {
-		"./$basename" when [qw/C CPP GCCGO GOLANG HASKELL PASCAL/];
-		"./$basename.exe" when 'MONO';
-		java => $basename when 'JAVA';
-		perl => $basename when 'PERL';
-		python => $basename when 'PYTHON';
-		default { die "Don't know how to execute format $format\n" }
-	}
-}
-
 sub mkrun{
 	my $format = shift;
 	sub{
@@ -84,7 +71,8 @@ sub mkrun{
 		my ($name, %args) = @_;
 		get_logger->trace("Running $name...");
 		my $basename = fileparse $name, qr/[.][^.]*/s;
-		my @args;
+		my @args = ('--sudo');
+		push @args, '--keep-stderr' if $ENV{TEST_VERBOSE};
 		push @args, '--timeout', $args{timeout} if $args{timeout};
 		push @args, '--mlimit',  $args{mlimit}  if $args{mlimit};
 		push @args, '--olimit',  $args{olimit}  if $args{olimit};
@@ -93,7 +81,7 @@ sub mkrun{
 		while (my ($fd, $file) = $it->()) {
 			push @args, "--fd=$fd $file";
 		}
-		execlist $basename, @args, command_and_args($format, $basename);
+		execlist $basename, @args, '--', "./$basename", @{$args{args}}
 	}
 }
 
@@ -104,17 +92,23 @@ sub prepare{
 	try {
 		execlist prog => '--fd=1 >>errors', '--fd=2 >>errors', 'gruntmaster-compile', $format, $name;
 	} catch {
-		die "Compile error\n"
+		my $exmsg = $_->[1];
+		die "Compile error ($exmsg)\n"
 	} finally {
 		$Gruntmaster::Daemon::errors .= read_file 'errors';
-		$Gruntmaster::Daemon::errors .= "\n";
+		$Gruntmaster::Daemon::errors .= "\n" if -s 'errors';
 		unlink 'errors';
 	};
 }
 
 sub prepare_files{
 	my $meta = shift;
-	runvm $_ for keys %{$meta->{files}};
+	if ($meta->{runner} eq 'Interactive') {
+		runvm ver => '-serial unix:vm.sock,nowait,server';
+		runvm prog => '-serial unix:vm.sock,nowait';
+	} else {
+		runvm $_ for keys %{$meta->{files}};
+	}
 
 	for my $file (values %{$meta->{files}}) {
 		my ($format, $name, $content) = @{$file}{qw/format name content/};