Changeset 116034 in webkit

Timestamp:

May 3, 2012 3:54:55 PM (12 years ago)

Author:

eric@webkit.org

Message:

Remove the last bits of Leopard support from our perl scripts
​https://bugs.webkit.org/show_bug.cgi?id=85545

Reviewed by Daniel Bates.

Chromium still supports Leopard (for a little while yet), but AppleMacWebKit dropped
Leopard support several months ago. Remove the last bits of isLeopard() branching
in our Perl scripts, since no one is using this (Chromium has never used this Perl code).

• Scripts/build-webkit:
• Scripts/old-run-webkit-tests:

(countAndPrintLeaks):
(captureSavedCrashLog):

• Scripts/webkitdirs.pm:

(determineArchitecture):
(argumentsForRunAndDebugMacWebKitApp):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2012-05-03  Eric Seidel  <eric@webkit.org>
+
+        Remove the last bits of Leopard support from our perl scripts
+        https://bugs.webkit.org/show_bug.cgi?id=85545
+
+        Reviewed by Daniel Bates.
+
+        Chromium still supports Leopard (for a little while yet), but AppleMacWebKit dropped
+        Leopard support several months ago.  Remove the last bits of isLeopard() branching
+        in our Perl scripts, since no one is using this (Chromium has never used this Perl code).
+
+        * Scripts/build-webkit:
+        * Scripts/old-run-webkit-tests:
+        (countAndPrintLeaks):
+        (captureSavedCrashLog):
+        * Scripts/webkitdirs.pm:
+        (determineArchitecture):
+        (argumentsForRunAndDebugMacWebKitApp):
+
 2012-05-03  Ojan Vafai  <ojan@chromium.org>
 

trunk/Tools/Scripts/build-webkit

@@ -154 +154 @@
 
     { option => "3d-canvas", desc => "Toggle 3D canvas (WebGL) support",
-      define => "ENABLE_WEBGL", default => (isAppleMacWebKit() && !isLeopard()), value => \$threeDCanvasSupport },
+      define => "ENABLE_WEBGL", default => isAppleMacWebKit(), value => \$threeDCanvasSupport },
 
     { option => "3d-rendering", desc => "Toggle 3D rendering support",

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

@@ -220 +220 @@
 
 if (isAppleMacWebKit()) {
-    if (isLeopard()) {
-        $platform = "mac-leopard";
-        $tolerance = 0.1;
-    } elsif (isSnowLeopard()) {
+    if (isSnowLeopard()) {
         $platform = "mac-snowleopard";
         $tolerance = 0.1;
@@ -1246 +1243 @@
     );
 
-    if (isLeopard()) {
-        # Leak list for the version of Leopard used on the build bot.
-        push @callStacksToExclude, (
-            "CFHTTPMessageAppendBytes", # leak in CFNetwork, rdar://problem/5435912
-            "sendDidReceiveDataCallback", # leak in CFNetwork, rdar://problem/5441619
-            "_CFHTTPReadStreamReadMark", # leak in CFNetwork, rdar://problem/5441468
-            "httpProtocolStart", # leak in CFNetwork, rdar://problem/5468837
-            "_CFURLConnectionSendCallbacks", # leak in CFNetwork, rdar://problem/5441600
-            "DispatchQTMsg", # leak in QuickTime, PPC only, rdar://problem/5667132
-            "QTMovieContentView createVisualContext", # leak in QuickTime, PPC only, rdar://problem/5667132
-            "_CopyArchitecturesForJVMVersion", # leak in Java, rdar://problem/5910823
-        );
-    }
-
     if (isSnowLeopard()) {
         push @callStacksToExclude, (
@@ -1800 +1783 @@
         $glob = File::Spec->catfile($testResultsDirectory, $windowsCrashLogFilePrefix . "*.txt");
     } elsif (isAppleMacWebKit()) {
-        my $crashLogDirectoryName;
-        if (isLeopard()) {
-            $crashLogDirectoryName = "CrashReporter";
-        } else {
-            $crashLogDirectoryName = "DiagnosticReports";
-        }
-
-        $glob = File::Spec->catfile("~", "Library", "Logs", $crashLogDirectoryName, ($webProcessCrashed ? "WebProcess" : $dumpToolName) . "_*.crash");
+        $glob = File::Spec->catfile("~", "Library", "Logs", "DiagnosticReports", ($webProcessCrashed ? "WebProcess" : $dumpToolName) . "_*.crash");
 
         # Even though the dump tool has exited, CrashReporter might still be running. We need to

trunk/Tools/Scripts/webkitdirs.pm

@@ -314 +314 @@
             chomp $architecture;
         } else {
-            if (isLeopard()) {
-                $architecture = `arch`;
-            } else {
-                my $supports64Bit = `sysctl -n hw.optional.x86_64`;
-                chomp $supports64Bit;
-                $architecture = $supports64Bit ? 'x86_64' : `arch`;
-            }
+            my $supports64Bit = `sysctl -n hw.optional.x86_64`;
+            chomp $supports64Bit;
+            $architecture = $supports64Bit ? 'x86_64' : `arch`;
             chomp $architecture;
         }
@@ -1353 +1349 @@
     determineOSXVersion();
     return $osXVersion;
-}
-
-sub isLeopard()
-{
-    return isDarwin() && osXVersion()->{"minor"} == 5;
 }
 
@@ -2489 +2480 @@
 {
     my @args = @ARGV;
-    push @args, ("-ApplePersistenceIgnoreState", "YES") if !isLeopard() && !isSnowLeopard() && checkForArgumentAndRemoveFromArrayRef("--no-saved-state", \@args);
+    push @args, ("-ApplePersistenceIgnoreState", "YES") if !isSnowLeopard() && checkForArgumentAndRemoveFromArrayRef("--no-saved-state", \@args);
     return @args;
 }