[tools] winetest: Remove support for CVS revisions.
Francois Gouget
fgouget at codeweavers.com
Tue Mar 16 06:15:45 CDT 2021
Don't expect them in the WineTest reports and don't store them in the
per-report summary.txt files.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---
This will allow removing the corresponding placeholders from WineTest
and TestLauncher next.
---
winetest/dissect | 28 ++++++++++++++--------------
winetest/gather | 2 +-
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/winetest/dissect b/winetest/dissect
index dbbbe6b6d..4f0e95b36 100755
--- a/winetest/dissect
+++ b/winetest/dissect
@@ -239,11 +239,11 @@ open IN, "<:raw", $report or mydie "could not open '$report' for reading: $!";
# summary.txt file format:
# Version <version>
-# - <dll> - missing - - - - -
-# - <dll> - skipped - - - - -
-# - <dll> <unit> skipped - - - <source> <rev>
-# - <dll> <unit> failed (258|crash) - - <source> <rev>
-# - <dll> <unit> <total> <todo> <failures> <skipped> <source> <rev>
+# - <dll> - missing - - - -
+# - <dll> - skipped - - - -
+# - <dll> <unit> skipped - - - <source>
+# - <dll> <unit> failed (258|crash) - - <source>
+# - <dll> <unit> <total> <todo> <failures> <skipped> <source>
open SUM, ">$tmpdir/summary.txt" or mydie "could not open '$tmpdir/summary.txt' for writing: $!";
my $line = <IN> || "";
@@ -431,11 +431,11 @@ while ($line = <IN> || "")
# For compatibility with old WineTest versions
$info =~ /^(?:failed|unknown|version not available)$/)
{
- print SUM "- $dll - missing - - - - -\n";
+ print SUM "- $dll - missing - - - -\n";
}
elsif ($info eq "skipped")
{
- print SUM "- $dll - skipped - - - - -\n";
+ print SUM "- $dll - skipped - - - -\n";
mydie "too many dlls skipped by user request (>$maxuserskips at $dll)" if ++$skipped_units > $maxuserskips;
}
}
@@ -445,7 +445,7 @@ while ($line = <IN> || "")
# Parse the tests output
#
-my ($dll, $unit, $units_re, $source, $rev, $result) = ("", "", "", "");
+my ($dll, $unit, $units_re, $source, $result) = ("", "", "", "");
my $unitsize = 0;
my %units;
my ($failures, $todo, $skipped) = (0, 0, 0);
@@ -570,7 +570,7 @@ sub close_test_unit($)
$failures += $extra_failures;
$summary = "$s_total $todo $failures $skipped" if (!defined $summary);
- print SUM "- $dll $unit $summary $source $rev\n";
+ print SUM "- $dll $unit $summary $source\n";
if ($failures && ++$failed_units > $maxfailedtests) {
mydie "too many failed test units (>$maxfailedtests at $dll:$unit)";
}
@@ -591,14 +591,14 @@ while ($line = <IN>) {
next if ($line =~ /^\s*$/); # empty lines have no impact
chomp $line;
$line =~ s/\r+$//;
- if ($line =~ m%^([_.a-z0-9-]+):([_a-z0-9]+) (start|skipped) (-|[/_.a-z0-9-]+) (-|[.0-9a-f]+)$%)
+ if ($line =~ m%^([_.a-z0-9-]+):([_a-z0-9]+) (start|skipped) (-|[/_.a-z0-9-]+)%)
{
- my ($l_dll, $l_unit, $l_type, $l_source, $l_rev) = ($1, $2, $3, $4, $5);
+ my ($l_dll, $l_unit, $l_type, $l_source) = ($1, $2, $3, $4);
# Close the previous test unit
close_test_unit(0) if ($dll ne "");
- ($dll, $unit, $source, $rev) = ($l_dll, $l_unit, $l_source, $l_rev);
+ ($dll, $unit, $source) = ($l_dll, $l_unit, $l_source);
%units = ($unit => 1);
$units_re = $unit;
@@ -606,7 +606,7 @@ while ($line = <IN>) {
if ($l_type eq "skipped")
{
add_test_line("skipped", "Skipped by user request");
- print SUM "- $dll $unit skipped - - - $source $rev\n";
+ print SUM "- $dll $unit skipped - - - $source\n";
mydie "too many test units skipped by user request (>$maxuserskips at $dll:$unit)" if ++$skipped_units > $maxuserskips;
$rc = 0;
}
@@ -771,7 +771,7 @@ while ($line = <IN>) {
# Then switch to the new test unit, not for the past lines, but for
# those before the next 'start' line. This 'new' test unit may have
# inconsistent results too.
- ($dll, $unit, $source, $rev) = ($l_dll, $l_unit, "-", "-");
+ ($dll, $unit, $source) = ($l_dll, $l_unit, "-");
%units = ($unit => 1);
$units_re = $unit;
$broken = 1;
diff --git a/winetest/gather b/winetest/gather
index 392e8e63f..a0b259b0d 100755
--- a/winetest/gather
+++ b/winetest/gather
@@ -312,7 +312,7 @@ foreach my $file (glob "$builddir/*/summary.txt") {
while (<TEST>) {
next if /^Archive: /;
my ($dummy, $dll, $unit, $count, $todos, $errors, $skips,
- $source, $rev) = split;
+ $source) = split;
my $testname = "$dll:$unit";
if ($count eq "missing")
--
2.20.1
More information about the wine-devel
mailing list