Commit 19e9d52b authored by aroben@apple.com's avatar 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.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@84377 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 503873ff
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>
Teach webkitdirs::winVersion about build numbers
......
......@@ -208,7 +208,7 @@ my %previousWindowsPostMortemDebuggerValues;
my $realPlatform;
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()) {
if (isTiger()) {
......@@ -242,8 +242,8 @@ if (isAppleMacWebKit()) {
$platform = "win-xp";
} elsif (isWindowsVista()) {
$platform = "win-vista";
} elsif (isWindows7()) {
$platform = "win-7";
} elsif (isWindows7SP0()) {
$platform = "win-7sp0";
} else {
$platform = "win";
}
......
......@@ -918,9 +918,9 @@ sub winVersion()
return $winVersion;
}
sub isWindows7()
sub isWindows7SP0()
{
return isAnyWindows() && winVersion()->{major} == 6 && winVersion()->{minor} == 1;
return isAnyWindows() && winVersion()->{major} == 6 && winVersion()->{minor} == 1 && winVersion()->{build} == 7600;
}
sub isWindowsVista()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment