Improve VM support

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

diff --git a/lib/Gruntmaster/Daemon/Format.pm b/lib/Gruntmaster/Daemon/Format.pm
index a3b8a65fedd6af3fab66f889b79b3acccdefd9ca..6160a31e9460a08bba84bafb9f44eab524ffc89d 100644 (file)
--- 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,
@@ -72,8 +71,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 +81,7 @@ sub mkrun{
                while (my ($fd, $file) = $it->()) {
                        push @args, "--fd=$fd $file";
                }
-               execlist $basename, @args, "./$basename"
+               execlist $basename, @args, '--', "./$basename", @{$args{args}}
        }
 }
 
@@ -93,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/};