waitpid $ret, 0;
} else {
open STDOUT, '>', $er or die "Cannot open $er\n";
+ get_logger->trace("Running: gruntmaster-exec @args");
exec 'gruntmaster-exec', @args;
}
}
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{
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};
while (my ($fd, $file) = $it->()) {
push @args, "--fd=$fd $file";
}
- execlist $basename, @args, command_and_args($format, $basename);
+ execlist $basename, @args, '--', "./$basename", @{$args{args}}
}
}
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';
};
}