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

diff --git a/t/01-jobs.t b/t/01-jobs.t
index 78dc416..f44a1e8 100644
--- a/t/01-jobs.t
+++ b/t/01-jobs.t
@@ -48,9 +48,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 +69,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}}