Prevent extraneous empty lines in compiler output

[gruntmaster-daemon.git] / lib / Gruntmaster / Daemon / Format.pm

diff --git a/lib/Gruntmaster/Daemon/Format.pm b/lib/Gruntmaster/Daemon/Format.pm
index cfc3cf306d25cf40aa37392fd0280f2c580488ca..cca52ed5fc437700b38aa381e61fed7e709d51b4 100644 (file)
--- a/lib/Gruntmaster/Daemon/Format.pm
+++ b/lib/Gruntmaster/Daemon/Format.pm
@@ -73,6 +73,7 @@ sub mkrun{
                get_logger->trace("Running $name...");
                my $basename = fileparse $name, qr/[.][^.]*/s;
                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};
@@ -81,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}}
        }
 }
 
@@ -95,7 +96,7 @@ sub prepare{
                die "Compile error\n"
        } finally {
                $Gruntmaster::Daemon::errors .= read_file 'errors';
-               $Gruntmaster::Daemon::errors .= "\n";
+               $Gruntmaster::Daemon::errors .= "\n" if -s 'errors';
                unlink 'errors';
        };
 }