Francois Gouget : winetest/gather: Truncated files are rejected.

Alexandre Julliard julliard at winehq.org
Thu Jul 1 15:25:08 CDT 2021


Module: tools
Branch: master
Commit: 4fde1079b1e417291e067331542673ae7d922f00
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=4fde1079b1e417291e067331542673ae7d922f00

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Thu Jul  1 19:26:33 2021 +0200

winetest/gather: Truncated files are rejected.

When a report size exceeds the size limit it is dropped so the
corresponding summary.txt file will never contain "failed filelimit".

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 winetest/gather | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/winetest/gather b/winetest/gather
index 1e9b2da..abb3395 100755
--- a/winetest/gather
+++ b/winetest/gather
@@ -108,8 +108,6 @@ sub short_date($)
 #  group         A reference to the group the report belongs to.
 #  missing       A hash of the reason why some test results are missing,
 #                  indexed by the test unit name.
-#  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
 #                  unit test's results. Note that there's no name collision
 #                  with the other fields because the test names contain a ':'.
@@ -349,9 +347,6 @@ foreach my $file (glob "$builddir/*/summary.txt") {
         if ($count eq "failed") {
             if ($todos eq "crash") {
                 $report->{$testname} = { status => "crash" };
-            } elsif ($todos eq "filelimit") {
-                $report->{$testname} = { status => "file limit" };
-                $report->{filelimit} = $testname;
             } else {
                 $report->{$testname} = { status => $todos };
             }
@@ -437,16 +432,12 @@ foreach my $group (@groups) {
         foreach my $report (@{$group->{reports}}) {
             if (!exists $report->{$testname}) {
                 my ($dll, $unit) = split(/:/, $testname);
-                my $filelimit = $report->{filelimit};
                 if (exists $report->{missing}->{$dll}) {
                     # Record the reason why this test is missing
                     $report->{$testname} = { status => $report->{missing}->{$dll},
                                              count  => [ 1, 1 ],
                                              skips  => [ 1, 1 ]
                                            };
-                } elsif (defined $filelimit && $testname gt $filelimit) {
-                    # Mark this test as missing because of a partial report file
-                    $report->{$testname}->{status} = "truncated";
                 } else {
                     # Mark this test as missing for an unknown reason (typically
                     # the start & done lines where unrecognizable)
@@ -650,7 +641,6 @@ sub get_result_title($$)
     if ($result->{status} eq "crash") { return "Test crashed"; }
     if ($result->{status} eq "258") { return "Test timed out"; }
     if ($result->{status} eq "skipped") { return "Skipped by user request"; }
-    if ($result->{status} eq "truncated") { return "The report was truncated"; }
 
     my ($dll, $unit) = split(/:/, $testname);
     $dll.=".dll" if ($dll !~ /\....?$/);
@@ -737,7 +727,6 @@ sub singletest($$$) {
             crash             => "crashed",
             258               => "timeout",
             mixed             => "mixed",
-            truncated         => "truncated",
         );
         $msg = $status2label{$status} || "unknown";
     }




More information about the wine-cvs mailing list