From: Marius Gavrilescu <marius@ieval.ro>
Date: Thu, 11 Feb 2016 16:29:35 +0000 (+0000)
Subject: Merge branch 'master' into scaleway
X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=commitdiff_plain;h=b64ba7e2b3b74ff6ee886e1ee3c85f7468758daf

Merge branch 'master' into scaleway
---

b64ba7e2b3b74ff6ee886e1ee3c85f7468758daf
diff --cc lib/Gruntmaster/Daemon.pm
index b8c6b5c,2af9b53..ef3aea6
--- a/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