Michael Stefaniuc : winetest: Reject test runs from NT3 and NT4 versions.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 0cbab747e7aed09af9e32d5d7a41b16b69881a72
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=0cbab747e7aed09af9e32d5d7...

Author: Michael Stefaniuc <mstefani(a)redhat.de>
Date:   Wed Feb  5 22:33:56 2014 +0100

winetest: Reject test runs from NT3 and NT4 versions.

---

 winetest/dissect       |   10 ++++++++--
 winetest/winetest.conf |    4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/winetest/dissect b/winetest/dissect
index fe80a44..9081a94 100755
--- a/winetest/dissect
+++ b/winetest/dissect
@@ -33,7 +33,7 @@ use open ':utf8';
 use CGI qw(:standard);
 charset("utf-8");
 
-use vars qw/$gitdir $gitweb $queuedir $datadir $maxmult $maxuserskips $maxfilesize $acceptwin9x/;
+use vars qw/$gitdir $gitweb $queuedir $datadir $maxmult $maxuserskips $maxfilesize $acceptprediluvianwin/;
 require "winetest.conf";
 
 my $name0=$0;
@@ -154,7 +154,8 @@ while (($_ = <IN>) =~ /^\s*([0-9a-zA-Z ]+)=(.*?)\r?$/) {
 }
 $box->{data} .= "</table>\n";
 
-if ($plid != 2) { mydie "platform $plid not accepted\n" unless $acceptwin9x; }
+my $prediluvian = 0;
+if ($plid != 2) { $prediluvian = 1; }
 
 $version = "unknown";
 if ($plid==1 && $major==4) {
@@ -168,8 +169,10 @@ if ($plid==1 && $major==4) {
 } elsif ($plid==2) {
     if      ($major==3 && $minor==51) {
         $version = "nt3";
+        $prediluvian = 1;
     } elsif ($major==4 && $minor== 0) {
         $version = "nt4";
+        $prediluvian = 1;
     } elsif ($major==5) {
         if      ($minor==0) {
             $version = "2000";
@@ -202,6 +205,9 @@ if ($plid==1 && $major==4) {
 } elsif ($plid==3) {
     #$version = "ce$major$minor";
 }
+
+if ($prediluvian and not $acceptprediluvianwin) { mydie "platform $version not accepted\n"; }
+
 if ($wine) {
     my %known_hosts = ( "Linux" => "linux",
                         "Darwin" => "mac",
diff --git a/winetest/winetest.conf b/winetest/winetest.conf
index 19104d8..40b3e50 100644
--- a/winetest/winetest.conf
+++ b/winetest/winetest.conf
@@ -14,8 +14,8 @@ $maxmult = 10;
 # Maximum allowed number of explicit user skips
 $maxuserskips = 10;
 
-# Whether to accept test results from Win9x versions
-$acceptwin9x = 0;
+# Whether to accept test results from Win9x / NT4 versions
+$acceptprediluvianwin = 0;
 
 # Maximum size of the report file
 # This should be in line with programs\winetest\send.c