ChangeSet ID: 31317 CVSROOT: /opt/cvs-commit Module name: tools Changes by: jnewman@winehq.org 2007/08/06 13:30:50
Modified files: winetest : gather
Log message: Paul Vriens paul.vriens.wine@gmail.com Show missing dll's in the single/group results
Patch: http://cvs.winehq.org/patch.py?id=31317
Old revision New revision Changes Path 1.22 1.23 +18 -3 tools/winetest/gather
Index: tools/winetest/gather diff -u -p tools/winetest/gather:1.22 tools/winetest/gather:1.23 --- tools/winetest/gather:1.22 6 Aug 2007 18:30:50 -0000 +++ tools/winetest/gather 6 Aug 2007 18:30:50 -0000 @@ -97,7 +97,8 @@ foreach my $file (glob "$datadir/$build/ $source, $rev) = split; my $testname = "$unit:$test"; if ($test =~ /_dll_missing/) { - # Skip these tests for now + # Mark the dll as missing on this system + $testref->{dllmissing}->{$unit} = $unit; next; } $testref->{results}->{$testname} = [$count, $todo, $error, $skipped]; @@ -130,8 +131,14 @@ foreach my $group (@groups) { if (!exists $test->{results}->{$testname}) { # Make sure missing tests are shown in the group results $group->{digests}->{$testname} = "differ"; - # Mark this test as missing for an unknown reason - $test->{results}->{$testname} = ["test missing", "-", "-", "-"]; + my ($dll, $subtest) = split(/:/, $testname); + if (exists $test->{dllmissing}->{$dll}) { + # Mark this test as missing because of a missing dll + $test->{results}->{$testname} = ["dll missing", "-", "-", "-"]; + } else { + # Mark this test as missing for an unknown reason + $test->{results}->{$testname} = ["test missing", "-", "-", "-"]; + } } } } @@ -224,6 +231,14 @@ sub singletest { $todo == 258?"timeout":"failed"; my $fail = -r "$datadir/$build/$file"?"<a href="$file">$msg</a>":$msg; print OUT " <td class="note">$fail</td>\n"; + } elsif ($count eq "dll missing") { + my ($dll, $subtest) = split(/:/, $testname); + print OUT <<"EOF"; + <td class="skip_pass"><a + title="No tests run as $dll.dll is not present on this system" + onMouseOver="No tests run as $dll.dll is not present on this system" + >0</a></td> +EOF } elsif ($count eq "test missing") { print OUT <<"EOF"; <td class="skip_fail"><a