Francois Gouget : winetest: What dissect and gather support depends on their code. So it makes no sense to put $fileversion in a configuration file. Also modify dissect to distinguish the supported report version from the version of the produced summary file .

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 3ed1950a6b537f03f63cfeb91130b0f411acd49d
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=3ed1950a6b537f03f63cfeb91...

Author: Francois Gouget 
Date:   Fri Mar 14 19:58:15 2008 +0100

winetest: What dissect and gather support depends on their code. So it makes no sense to put $fileversion in a configuration file. Also modify dissect to distinguish the supported report version from the version of the produced summary file.

---

winetest/dissect       |   11 ++++++++---
 winetest/gather        |    7 +++++--
 winetest/winetest.conf |    3 ---
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/winetest/dissect b/winetest/dissect
index 46b8970..b3e9a56 100755
--- a/winetest/dissect
+++ b/winetest/dissect
@@ -29,12 +29,17 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

use strict;
-use vars qw/$builds $queuedir $datadir $maxmult $fileversion $maxfilesize/;
+use vars qw/$builds $queuedir $datadir $maxmult $maxfilesize/;
 require "winetest.conf";

my $name0=$0;
 $name0 =~ s+^.*/++;

+# We support reports version 4 and up
+my $minimum_report_version=4;
+# And we generate summary files version 4
+my $summary_version=4;
+

use File::Temp qw/tempdir/;
 use Errno qw/ENOTEMPTY/;
@@ -65,8 +70,8 @@ my $filesize = -s "$report";

$_ = <IN>;
 /^Version (\d+)\r?$/ or mydie "no version header: $_";
-$1 eq $fileversion or mydie "illegal version: $1\n";
-print SUM "Version $fileversion\n";
+mydie "illegal version: $1\n" if ($1 lt $minimum_report_version);
+print SUM "Version $summary_version\n";

$_ = <IN>;
 /^Tests from build ([-.0-9a-zA-Z]+)\r?$/ or mydie "no build header: $_";
diff --git a/winetest/gather b/winetest/gather
index 8a5588f..a84e5be 100755
--- a/winetest/gather
+++ b/winetest/gather
@@ -27,12 +27,15 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

use strict;
-use vars qw/$datadir $fileversion/;
+use vars qw/$datadir/;
 require "winetest.conf";

my $name0=$0;
 $name0 =~ s+^.*/++;

+# We support summary files version 4 and up
+my $summary_version=4;
+

# Group result containers:
 #  name        Group name
@@ -116,7 +119,7 @@ foreach my $file (glob "$datadir/$build/*/summary.txt") {
         print STDERR "$name0:error: unable to open '$file' for reading: $!\n";
         next;
     }
-    if (($_ = <TEST>) ne "Version $fileversion\n") {
+    if (($_ = <TEST>) ne "Version $summary_version\n") {
         print STDERR "$name0:error: wrong header in '$file': $_";
         close TEST;
         next;
diff --git a/winetest/winetest.conf b/winetest/winetest.conf
index d7ffb69..a7ddf3f 100644
--- a/winetest/winetest.conf
+++ b/winetest/winetest.conf
@@ -9,9 +9,6 @@ $datadir  = "$root/data";
 # Maximum number of reports for one version and tag
 $maxmult = 10;

-# File version number
-$fileversion = 4;
-
 # Maximum size of the report file
 # This should be in line with programs\winetest\send.c
 $maxfilesize = 1.5 * 1024 * 1024;