tools/winetest dissect gather

[Jeremy Newman]

ChangeSet ID:	30874
CVSROOT:	/opt/cvs-commit
Module name:	tools
Changes by:	[e-mail]	2007/01/11 11:03:43

Modified files:
    winetest       : dissect gather

Log message:
    Paul Vriens 
    Support Vista on test.winehq.org

Patch: http://cvs.winehq.org/patch.py?id=30874

Old revision  New revision  Changes     Path
 1.17          1.18          +2 -0       tools/winetest/dissect
 1.16          1.17          +12 -11     tools/winetest/gather

Index: tools/winetest/dissect
diff -u -p tools/winetest/dissect:1.17 tools/winetest/dissect:1.18
--- tools/winetest/dissect:1.17	11 Jan 2007 17: 3:43 -0000
+++ tools/winetest/dissect	11 Jan 2007 17: 3:43 -0000
@@ -130,6 +130,8 @@ if ($plid==1 && $major==4) {
         } elsif ($minor==2) {
             $version = "2003";
         }
+    } elsif ($major==6) {
+        $version = "vista";
     }
 } elsif ($plid==3) {
     $version = "ce$major$minor";
Index: tools/winetest/gather
diff -u -p tools/winetest/gather:1.16 tools/winetest/gather:1.17
--- tools/winetest/gather:1.16	11 Jan 2007 17: 3:43 -0000
+++ tools/winetest/gather	11 Jan 2007 17: 3:43 -0000
@@ -37,22 +37,23 @@ my $fileversion = 3;
 # digests: hashes report digests or "differ" to test names
 # visible: whether winetest ran on a visible desktop
 # tests: array of test hashes (name, tag, dir, results hash).
-my %w95  = (name => "Win95");
-my %w98  = (name => "Win98");
-my %me   = (name => "Me");
-my %nt3  = (name => "NT 3");
-my %nt4  = (name => "NT 4");
-my %w2k  = (name => "2000");
-my %xp   = (name => "XP");
-my %w2k3 = (name => "2003");
-my %wine = (name => "Wine");
+my %w95   = (name => "Win95");
+my %w98   = (name => "Win98");
+my %me    = (name => "Me");
+my %nt3   = (name => "NT 3");
+my %nt4   = (name => "NT 4");
+my %w2k   = (name => "2000");
+my %xp    = (name => "XP");
+my %w2k3  = (name => "2003");
+my %vista = (name => "Vista");
+my %wine  = (name => "Wine");

# Map dissect's IDs to the above hashes
 my %idmap = (95=>%w95, 98=>%w98, me=>%me, nt3=>%nt3, nt4=>%nt4,
-             2000=>%w2k, xp=>%xp, 2003=>%w2k3, wine=>%wine);
+             2000=>%w2k, xp=>%xp, 2003=>%w2k3, vista=>%vista, wine=>%wine);

# Define the order of version groups in the summary
-my @groups = (%w95, %w98, %me, %nt3, %nt4, %w2k, %xp, %w2k3, %wine);
+my @groups = (%w95, %w98, %me, %nt3, %nt4, %w2k, %xp, %w2k3, %vista, %wine);

my ($outdated,undef) = glob "$datadir/*/outdated";
 exit 2 unless defined $outdated;