Merge branch 'master' into scaleway

diff --cc lib/Gruntmaster/Daemon.pm
index b8c6b5c5c839052baf31bd6a50d42d5cf3298cac,2af9b5306a78229d334deaa819bd2b0fd30ece26..ef3aea61a758222da80b195914079246e8e02920
--- 1/lib/Gruntmaster/Daemon.pm
--- 2/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@@ -82,15 -80,17 +80,18 @@@ sub process
                                }
                        };
  
+                       my $time = '?';
+                       $time = (read_file 'time-stop-prog') - (read_file 'time-start-prog') if -f 'time-stop-prog' && -f 'time-start-prog';
+                       unlink 'time-start-prog', 'time-stop-prog';
                        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}
+                               push @full_results, {id => $test, result => $result->[0], result_text => $result_text, time => $time}
                        } else {
                                get_logger->trace("Test $test result is $result");
-                               push @full_results, {id => $test, result => 0, result_text => $result, time => time - $start_time}
+                               push @full_results, {id => $test, result => 0, result_text => $result, time => $time}
                        }
                        push @results, $result;
                        last if $meta->{judge} eq 'Absolute' && ref $result

diff --cc lib/Gruntmaster/Daemon/Format.pm
Simple merge