WineHQ: winetest: simplification + don't hide errors

[Ferenc Wagner]

Changelog:
- Simplify version identification by dropping subversions.
- Don't hide identical error reports.

Feri.

Index: winetest/dissect
===================================================================
RCS file: /home/wine/tools/winetest/dissect,v
retrieving revision 1.10
diff -u -r1.10 dissect
--- winetest/dissect	4 May 2004 15:23:58 -0000	1.10
+++ winetest/dissect	18 Jun 2004 01:14:00 -0000
@@ -103,34 +103,31 @@
         $build = $2;
     }
 }
-if ($plid==1 && $major==4 && $minor== 0 && $build== 950) {
-    $version = "95";
-} elsif ($plid==1 && $major==4 && $minor== 0 && $build > 950 && $build<=1080) {
-    $version = "95sp1";
-} elsif ($plid==1 && $major==4 && $minor <10 && $build >1080) {
-    $version = "95osr2";
-} elsif ($plid==1 && $major==4 && $minor==10 && $build==1998) {
-    $version = "98";
-} elsif ($plid==1 && $major==4 && $minor==10 && $build >1998 && $build <2183) {
-    $version = "98sp1";
-} elsif ($plid==1 && $major==4 && $minor==10 && $build>=2183) {
-    $version = "98se";
-} elsif ($plid==1 && $major==4 && $minor==90 && $build==3000) {
-    $version = "me";
-} elsif ($plid==2 && $major==3 && $minor==51 && $build==1057) {
-    $version = "nt3";
-} elsif ($plid==2 && $major==4 && $minor== 0 && $build==1381) {
-    $version = "nt4";
-} elsif ($plid==2 && $major==5 && $minor== 0 && $build==2195) {
-    $version = "2000";
-} elsif ($plid==2 && $major==5 && $minor== 1 && $build==2600) {
-    $version = "xp";
-} elsif ($plid==2 && $major==5 && $minor== 2 && $build==3790) {
-    $version = "2003";
+$version = unknown
+if ($plid==1 && $major==4) {
+    if ($minor<=10 && $build<1998) {
+        $version = "95";
+    } elsif ($minor==10) {
+        $version = "98";
+    } elsif ($minor==90 && $build==3000) {
+        $version = "me";
+    }
+} elsif ($plid==2) {
+    if      ($major==3 && $minor==51 && $build==1057) {
+        $version = "nt3";
+    } elsif ($major==4 && $minor== 0 && $build==1381) {
+        $version = "nt4";
+    } elsif ($major==5) {
+        if      ($minor==0 && $build==2195) {
+            $version = "2000";
+        } elsif ($minor==1 && $build==2600) {
+            $version = "xp";
+        } elsif ($minor==2 && $build==3790) {
+            $version = "2003";
+        }
+    }
 } elsif ($plid==3) {
     $version = "ce$major$minor";
-} else {
-    $version = "unknown";
 }
 
 /Test output:\r?/ or mydie "no test header: $_";
Index: winetest/gather
===================================================================
RCS file: /home/wine/tools/winetest/gather,v
retrieving revision 1.9
diff -u -r1.9 gather
--- winetest/gather	4 May 2004 15:24:34 -0000	1.9
+++ winetest/gather	18 Jun 2004 01:14:00 -0000
@@ -76,6 +76,10 @@
     (my $dir = $file) =~ s|^\Q$datadir/$build\E/(.*?)/summary.txt$|$1|;
     my $testref = {};
     (my $id, my @tag) = split /_/, $dir;
+    if (!exists $ids{$id}) {
+        print "Unknown architecture: $id\n";
+        next;
+    }
     $testref->{tag} = @tag?"@tag":"";
     $testref->{dir} = $dir;
     $testref->{name} = $ids{$id}->{name}; # record origin
@@ -113,7 +117,9 @@
         my $prevdigest = \$group->{digests}->{$testname};
         if ($$prevdigest) {
             $$prevdigest = "differ" if
-              $$prevdigest ne $digest || $count eq "failed";
+              $$prevdigest ne $digest ||
+              $count eq "failed" ||
+              $error != 0;
         } else {
             $$prevdigest = $digest;
         }
@@ -131,7 +137,7 @@
         if ($testnum > 1) {
             $header .= "      <th><a href=\"#$_->{name}\">$_->{name} ($testnum)</a></th>\n";
         } else {
-            $header .= "      <th><a href=\"$_->{tests}->[0]->{dir}/report\">$_->{tests}->[0]->{name}</a></th>\n";
+            $header .= "      <th><a href=\"$_->{tests}->[0]->{dir}/report\">$_->{name}</a></th>\n";
         }
     } else {
         $header .= "      <th>$_->{name}</th>\n";