X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon%2FFormat.pm;h=bcfb2a4ebfe0a48db0adefe1bf3ef4583ea3db8f;hp=a3b8a65fedd6af3fab66f889b79b3acccdefd9ca;hb=13b1661a226f1008a3621fa4ab4f2a8d3ed8b47e;hpb=16724726149793a6a78336cc7c46e751c363df10 diff --git a/lib/Gruntmaster/Daemon/Format.pm b/lib/Gruntmaster/Daemon/Format.pm index a3b8a65..bcfb2a4 100644 --- a/lib/Gruntmaster/Daemon/Format.pm +++ b/lib/Gruntmaster/Daemon/Format.pm @@ -72,8 +72,8 @@ sub mkrun{ my ($name, %args) = @_; get_logger->trace("Running $name..."); my $basename = fileparse $name, qr/[.][^.]*/s; - my @args = ('--nobody'); - push @args, '--no-close' if $ENV{TEST_VERBOSE}; + 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}; @@ -82,7 +82,7 @@ sub mkrun{ while (my ($fd, $file) = $it->()) { push @args, "--fd=$fd $file"; } - execlist $basename, @args, "./$basename" + execlist $basename, @args, '--', "./$basename", @{$args{args}} } } @@ -93,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'; }; }