X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=t%2F01-jobs.t;h=552e36f8cd238cd9d2a0791cb8db2bea67fe5590;hp=78dc416cb5a7b4acd20e8f8002ab8fbe990c563f;hb=cd0623f030026cc4a5c2c03d4464bb2d3cb75ca8;hpb=fd807ac9dddfd831fc6f963fd5f6613b2e78c944

diff --git a/t/01-jobs.t b/t/01-jobs.t
index 78dc416..552e36f 100644
--- a/t/01-jobs.t
+++ b/t/01-jobs.t
@@ -28,7 +28,9 @@ use constant COMPILER => {
 	   GCCGO gccgo
 	   HASKELL ghc
 	   PERL perl
-	   PYTHON python/};
+	   PYTHON python
+	   RUBY ruby
+	   SBCL sbcl/};
 
 my $loglevel = $ENV{TEST_LOG_LEVEL} // ($ENV{TEST_VERBOSE} ? 'TRACE' : 'OFF');
 my $log_conf = <<CONF;
@@ -48,9 +50,10 @@ sub check_job{
 	if (defined $meta->{results}) {
 		delete $meta->{results}[$_]{time} for keys @{$meta->{results}};
 	}
-	is $meta->{result}, $meta->{expected_result}, "Result is correct";
-	is $meta->{result_text}, $meta->{expected_result_text}, "Result text is correct";
-	is_deeply $meta->{results}, $meta->{expected_results}, "Results are correct";
+	my $desc = $meta->{name} . ': ' . $meta->{test_name};
+	is $meta->{result}, $meta->{expected_result}, "Result is correct ($desc)";
+	is $meta->{result_text}, $meta->{expected_result_text}, "Result text is correct ($desc)";
+	is_deeply $meta->{results}, $meta->{expected_results}, "Results are correct ($desc)";
 }
 
 my @problems = exists $ENV{TEST_PROBLEMS} ? map {"t/problems/$_"} split ' ', $ENV{TEST_PROBLEMS} : <t/problems/*>;
@@ -68,7 +71,7 @@ for my $problem (@problems) {
 	my $pbmeta = LoadFile "$problem/meta.yml";
 	for (1 .. $pbmeta->{testcnt}) {
 		$pbmeta->{infile}[$_ - 1] = read_file "$problem/$_.in" if $pbmeta->{generator} eq 'File';
-		$pbmeta->{okfile}[$_ - 1] = read_file "$problem/$_.ok" if $pbmeta->{runner} eq 'File';
+		$pbmeta->{okfile}[$_ - 1] = read_file "$problem/$_.ok" if $pbmeta->{runner} && $pbmeta->{runner} eq 'File';
 	}
 	if (exists $pbmeta->{files}) {
 		$_->{content} = read_file "$problem/$_->{name}" for values %{$pbmeta->{files}}
@@ -84,7 +87,7 @@ for my $problem (@problems) {
 					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} && $format eq 'JAVA' || $format eq 'GOLANG' || $format eq 'GCCGO';
+					skip "$format requires multiple processes. Set GRUNTMASTER_KILL_USER and GRUNTMASTER_SUDO to allow multiple processes.", 3 if !$ENV{GRUNTMASTER_KILL_USER} && $format eq 'JAVA' || $format eq 'GOLANG' || $format eq 'GCCGO' || $format eq 'RUBY';
 					$meta->{files}{prog}{content} = read_file "$source/$meta->{files}{prog}{name}";
 				}
 				$meta = merge $meta, $pbmeta;