Merge branch 'master' into scaleway

diff --combined lib/Gruntmaster/Daemon.pm
index 59ee1650c8a05a8f939e301bdb361234ea590b64,8e6cbf38d557ca3438a619f71d7bed9ae8981b11..b8c6b5c5c839052baf31bd6a50d42d5cf3298cac
--- 1/lib/Gruntmaster/Daemon.pm
--- 2/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@@ -7,7 -7,7 +7,7 @@@ use warnings
  our $VERSION = '5999.000_005';
  
  use Gruntmaster::Daemon::Constants qw/ERR/;
 -use Gruntmaster::Daemon::Format qw/prepare_files stopvms/;
 +use Gruntmaster::Daemon::Format qw/prepare_files copy_from_vm stopvms/;
  
  use File::Slurp qw/read_file/;
  use File::Temp qw/tempdir/;
@@@ -29,6 -29,7 +29,7 @@@ use constant FORMAT_EXTENSION => 
        JAVA => 'java',
        JULIA => 'jl',
        MONO => 'cs',
+       OBERON => 'm',
        OCAML => 'ml',
        PASCAL => 'pas',
        PERL => 'pl',
@@@ -83,7 -84,6 +84,7 @@@ sub process
  
                        if (ref $result) {
                                my $result_text = $result->[1];
 +                              copy_from_vm 'result';
                                $result_text .= ': ' . read_file 'result' if -s 'result';
                                get_logger->trace("Test $test result is " . $result_text);
                                push @full_results, {id => $test, result => $result->[0], result_text => $result_text, time => time - $start_time}

diff --combined t/01-jobs.t
index ee9cb27a6cdc25d9e662512d8be49755856f55f0,3f00b3d0b90f8c81ba6af2b276b9f5cc13f327e9..a7a1ffaa7e6014e160aef23b3c245032a9011a37
--- 1/t/01-jobs.t
--- 2/t/01-jobs.t
+++ b/t/01-jobs.t
@@@ -36,6 -36,7 +36,7 @@@ use constant COMPILER => 
           PYTHON python2.7
           RUBY ruby
           RUST rustc
+          OBERON obc
           OCAML ocaml
           SBCL sbcl/};
  
@@@ -95,8 -96,8 +96,8 @@@ for my $problem (@problems) 
                                if ($meta->{files}{prog}) {
                                        my $format = $meta->{files}{prog}{format};
                                        my $compiler = COMPILER->{$format};
 -                                      skip "$compiler not found in path", 3 unless $ENV{GRUNTMASTER_VM} || which $compiler;
 -                                      skip "$format requires multiple processes. Set GRUNTMASTER_KILL_USER and GRUNTMASTER_SUDO to allow multiple processes.", 3 if !$ENV{GRUNTMASTER_KILL_USER} && $needs_fork{$format};
 +#                                     skip "$compiler not found in path", 3 unless $ENV{GRUNTMASTER_VM} || which $compiler;
 +#                                     skip "$format requires multiple processes. Set GRUNTMASTER_KILL_USER and GRUNTMASTER_SUDO to allow multiple processes.", 3 if !$ENV{GRUNTMASTER_KILL_USER} && $needs_fork{$format};
                                        $meta->{files}{prog}{content} = read_file "$source/$meta->{files}{prog}{name}";
                                }
                                $meta = merge $meta, $pbmeta;