Module: tools Branch: master Commit: ac431db6c41326b865e51e20fe88ab9a9655573f URL: http://source.winehq.org/git/tools.git/?a=commit;h=ac431db6c41326b865e51e20f...
Author: Francois Gouget fgouget@codeweavers.com Date: Wed Mar 29 00:36:28 2017 +0200
winetest/gather: Remove support for the 'winetest crash' case.
dissect has no support for writing this type of status in the summary.txt files. Also if WineTest does crash one would likely have to manually submit the results (i.e. it's unlikely to happen). And most importantly a lot of test results would be missing which, based on the current policy, means the whole report is and should be rejected.
Signed-off-by: Francois Gouget fgouget@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
winetest/gather | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/winetest/gather b/winetest/gather index cf4423a..a0cb9b7 100755 --- a/winetest/gather +++ b/winetest/gather @@ -79,8 +79,6 @@ my $summary_version=4; # dir The directory containing the report data (log files, etc). # group A reference to the group the report belongs to. # dllmissing A hash of the missing dlls for that system. -# winetestcrash The name of the last test that was run before winetest -# crashed. # filelimit The name of the last test that was run before the report file # size limit was reached. # <testname> Maps the test names to a structure containing the individual @@ -179,10 +177,7 @@ foreach my $file (glob "$datadir/$build/*/summary.txt") { $alltests{$testname} = $source;
if ($count eq "failed") { - if ($todos eq "crash") { - $report->{$testname} = { status => "winetest crash" }; - $report->{winetestcrash} = $testname; - } elsif ($todos eq "filelimit") { + if ($todos eq "filelimit") { $report->{$testname} = { status => "file limit" }; $report->{filelimit} = $testname; } else { @@ -265,7 +260,6 @@ foreach my $group (@groups) { foreach my $report (@{$group->{reports}}) { if (!exists $report->{$testname}) { my ($dll, $unit) = split(/:/, $testname); - my $crash = $report->{winetestcrash}; my $filelimit = $report->{filelimit}; if (exists $report->{dllmissing}->{$dll}) { # Mark this test as missing because of a missing dll @@ -273,9 +267,6 @@ foreach my $group (@groups) { count => [ 1, 1 ], skips => [ 1, 1 ] }; - } elsif (defined $crash && $testname gt $crash) { - # Mark this test as missing because of a winetest crash - $report->{$testname}->{status} = "winetest crash"; } elsif (defined $filelimit && $testname gt $filelimit) { # Mark this test as missing because of a partial report file $report->{$testname}->{status} = "filelimit"; @@ -490,7 +481,6 @@ sub get_result_title($$) return "No tests run as $dll is not present on this system"; } if ($result->{status} eq "skipped") { return "Test skipped by user request"; } - if ($result->{status} eq "winetest crash") { return "Test did not run as winetest crashed"; } if ($result->{status} eq "filelimit") { return "Test is missing because of a partial report file"; } if ($result->{status} eq "missing") { return "Test did not run for an unknown reason"; } if ($result->{status} eq "mixed") { return "Mixed results"; } @@ -544,10 +534,6 @@ sub singletest($$$) { { $msg = "n/a"; } - elsif ($status eq "winetest crash") - { - $msg = "winetest"; - } elsif ($status eq "filelimit") { $msg = "truncated";