Enable a Leopard-specific Skipped list.

Reviewed by Mark.

* Scripts/run-webkit-tests: Check for Leopard.
* Scripts/webkitdirs.pm: Added isTiger/isLeopard.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@24006 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ff004ff30840b72840e9b1b14633865d91e15331..873f8fb54c2805ef1fdd6efa14e03d40e52b3691 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2007-07-04  Adam Roben  <aroben@apple.com>
+
+        Enable a Leopard-specific Skipped list.
+
+        Reviewed by Mark.
+
+        * Scripts/run-webkit-tests: Check for Leopard.
+        * Scripts/webkitdirs.pm: Added isTiger/isLeopard.
+
 2007-07-03  Adam Roben  <aroben@apple.com>
 
         Fixed update-webkit-localizable-strings to work with new extract-localizable-strings

diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index 841557eb655eb14aa61baaacf0568fe783c297fc..a0bc831be4b7eef5058167388cb29d51d08b61af 100755 (executable)
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -224,7 +224,9 @@ my $layoutTestsName = "LayoutTests";
 my $testDirectory = File::Spec->rel2abs($layoutTestsName);
 my $platformTestDirectory = $testDirectory;
 my $expectedDirectory = $testDirectory;
-if (isQt()) {
+if (isLeopard()) {
+    $platformTestDirectory = "$testDirectory/mac/leopard";
+} elsif (isQt()) {
     $expectedDirectory = "LayoutTests/qt/";
     $platformTestDirectory = $expectedDirectory;
 } elsif (isCygwin()) {

diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index f5f433c391089e83250c8ae6654ae6e5e51d9bf6..97b60f8b3ad62176eae392bc3ada9dce114ff1a4 100644 (file)
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -48,6 +48,7 @@ my $configuration;
 my $configurationProductDir;
 my $sourceDir;
 my $currentSVNRevision;
+my $osXVersion;
 
 # Variables for Win32 support
 my $vcBuildPath;
@@ -398,6 +399,41 @@ sub isOSX()
     return ($^O eq "darwin");
 }
 
+sub determineOSXVersion()
+{
+    return if $osXVersion;
+
+    if (!isOSX()) {
+        $osXVersion = -1;
+        return;
+    }
+
+    my $version = `sw_vers -productVersion`;
+    my @splitVersion = split(/\./, $version);
+    @splitVersion >= 2 or die "Invalid version $version";
+    $osXVersion = {
+            "major" => $splitVersion[0],
+            "minor" => $splitVersion[1],
+            "subminor" => (defined($splitVersion[2]) ? $splitVersion[2] : 0),
+    };
+}
+
+sub osXVersion()
+{
+    determineOSXVersion();
+    return $osXVersion;
+}
+
+sub isTiger()
+{
+    return isOSX() && osXVersion()->{"minor"} == 4;
+}
+
+sub isLeopard()
+{
+    return isOSX() && osXVersion()->{"minor"} == 5;
+}
+
 sub checkRequiredSystemConfig
 {
     if (isOSX()) {