X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon%2FFormat.pm;h=2b60139327f827366b965b48a4854dc29021518a;hp=28aa5339bf6cb1319623a9516b2041404659fa94;hb=36ecc8ea1322839782fce6d8d765f3fe7ab4f575;hpb=e61f1a82d795972ebc7fedfe2b599b69ff5b2237

diff --git a/lib/Gruntmaster/Daemon/Format.pm b/lib/Gruntmaster/Daemon/Format.pm
index 28aa533..2b60139 100644
--- a/lib/Gruntmaster/Daemon/Format.pm
+++ b/lib/Gruntmaster/Daemon/Format.pm
@@ -65,19 +65,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{
@@ -85,7 +72,8 @@ sub mkrun{
 		my ($name, %args) = @_;
 		get_logger->trace("Running $name...");
 		my $basename = fileparse $name, qr/[.][^.]*/s;
-		my @args;
+		my @args = ('--nobody');
+		push @args, '--no-close' 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};
@@ -94,7 +82,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}}
 	}
 }
 
@@ -105,10 +93,11 @@ 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';
 	};
 }