Changeset 84377 in webkit

Timestamp:

Apr 20, 2011 9:05:36 AM (13 years ago)

Author:

Adam Roben

Message:

Replace old-run-webkit-tests's win-7 platform with win-7sp0

It was an error that we had a win-7 platform to begin with. Windows 7 was the most recent
version of Windows we cared about, so its results should just go in win. But now that
Windows 7 SP1 exists (and has different results for some tests), we need a place to store
results for Windows 7 without SP1 (and older versions of Windows).

Part of <​http://webkit.org/b/56617> Several tests fail on Windows 7 SP1 due to font
differences from Windows 7 "SP0"

Reviewed by David Kilzer.

• Scripts/old-run-webkit-tests: Replaced win-7 with win-7sp0. Newer versions of Windows 7

will just use "win".

• Scripts/webkitdirs.pm:

(isWindows7SP0): Added. Replaces isWindows7, because that function had no remaining callers.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/old-run-webkit-tests (modified) (2 diffs)
• Scripts/webkitdirs.pm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-20  Adam Roben  <aroben@apple.com>
+
+        Replace old-run-webkit-tests's win-7 platform with win-7sp0
+
+        It was an error that we had a win-7 platform to begin with. Windows 7 was the most recent
+        version of Windows we cared about, so its results should just go in win. But now that
+        Windows 7 SP1 exists (and has different results for some tests), we need a place to store
+        results for Windows 7 without SP1 (and older versions of Windows).
+
+        Part of <http://webkit.org/b/56617> Several tests fail on Windows 7 SP1 due to font
+        differences from Windows 7 "SP0"
+
+        Reviewed by David Kilzer.
+
+        * Scripts/old-run-webkit-tests: Replaced win-7 with win-7sp0. Newer versions of Windows 7
+        will just use "win".
+
+        * Scripts/webkitdirs.pm:
+        (isWindows7SP0): Added. Replaces isWindows7, because that function had no remaining callers.
+
 2011-04-20  Adam Roben  <aroben@apple.com>
 

trunk/Tools/Scripts/old-run-webkit-tests

@@ -209 +209 @@
 
 my @macPlatforms = ("mac-tiger", "mac-leopard", "mac-snowleopard", "mac");
-my @winPlatforms = ("win-xp", "win-vista", "win-7", "win");
+my @winPlatforms = ("win-xp", "win-vista", "win-7sp0", "win");
 
 if (isAppleMacWebKit()) {
@@ -243 +243 @@
     } elsif (isWindowsVista()) {
         $platform = "win-vista";
-    } elsif (isWindows7()) {
-        $platform = "win-7";
+    } elsif (isWindows7SP0()) {
+        $platform = "win-7sp0";
     } else {
         $platform = "win";

trunk/Tools/Scripts/webkitdirs.pm

@@ -919 +919 @@
 }
 
-sub isWindows7()
-{
-    return isAnyWindows() && winVersion()->{major} == 6 && winVersion()->{minor} == 1;
+sub isWindows7SP0()
+{
+    return isAnyWindows() && winVersion()->{major} == 6 && winVersion()->{minor} == 1 && winVersion()->{build} == 7600;
 }