Alexandre Julliard : winetest: Reject test runs from Win9x versions.

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Thu Apr 21 12:15:37 2011 +0200

winetest: Reject test runs from Win9x versions.

---

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

diff --git a/winetest/dissect b/winetest/dissect
index d0b830b..03dcfd1 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/;
+use vars qw/$gitdir $gitweb $queuedir $datadir $maxmult $maxuserskips $maxfilesize $acceptwin9x/;
 require "winetest.conf";

my $name0=$0;
@@ -152,6 +152,8 @@ while (($_ = <IN>) =~ /^\s*([0-9a-zA-Z ]+)=(.*?)\r?$/) {
 }
 $box->{data} .= "</table>\n";

+if ($plid != 2) { mydie "platform $plid not accepted\n" unless $acceptwin9x; }
+
 $version = "unknown";
 if ($plid==1 && $major==4) {
     if      ($minor==0) {
diff --git a/winetest/winetest.conf b/winetest/winetest.conf
index 9699503..3231d06 100644
--- a/winetest/winetest.conf
+++ b/winetest/winetest.conf
@@ -14,6 +14,9 @@ $maxmult = 10;
 # Maximum allowed number of explicit user skips
 $maxuserskips = 10;

+# Whether to accept test results from Win9x versions
+$acceptwin9x = 0;
+
 # Maximum size of the report file
 # This should be in line with programs\winetest\send.c
 $maxfilesize = 1.5 * 1024 * 1024;