Skip to content
This repository has been archived by the owner on Jun 16, 2018. It is now read-only.

Commit

Permalink
Remove the last bits of Leopard support from our perl scripts
Browse files Browse the repository at this point in the history
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):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@116034 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
eric@webkit.org committed May 3, 2012
1 parent 9541e34 commit 04bdd76
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 40 deletions.
19 changes: 19 additions & 0 deletions Tools/ChangeLog
@@ -1,3 +1,22 @@
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>

[Chromium] Don't show the WebKit Linux ASAN bot on the flakiness dashboard.
Expand Down
2 changes: 1 addition & 1 deletion Tools/Scripts/build-webkit
Expand Up @@ -153,7 +153,7 @@ my @features = (
define => "ENABLE_DOWNLOAD_ATTRIBUTE", default => isBlackBerry(), value =>\$downloadAttributeSupport },

{ 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",
define => "ENABLE_3D_RENDERING", default => (isAppleMacWebKit() || isQt()), value => \$threeDRenderingSupport },
Expand Down
28 changes: 2 additions & 26 deletions Tools/Scripts/old-run-webkit-tests
Expand Up @@ -219,10 +219,7 @@ my @macPlatforms = ("mac-leopard", "mac-snowleopard", "mac-lion", "mac");
my @winPlatforms = ("win-xp", "win-vista", "win-7sp0", "win");

if (isAppleMacWebKit()) {
if (isLeopard()) {
$platform = "mac-leopard";
$tolerance = 0.1;
} elsif (isSnowLeopard()) {
if (isSnowLeopard()) {
$platform = "mac-snowleopard";
$tolerance = 0.1;
} elsif (isLion()) {
Expand Down Expand Up @@ -1245,20 +1242,6 @@ sub countAndPrintLeaks($$$)
"ScanFromString", # <http://code.google.com/p/angleproject/issues/detail?id=249> leak in ANGLE
);

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, (
"readMakerNoteProps", # <rdar://problem/7156432> leak in ImageIO
Expand Down Expand Up @@ -1799,14 +1782,7 @@ sub captureSavedCrashLog($$)
if (isCygwin()) {
$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
# wait for it to exit to ensure it has saved its crash log to disk. For simplicitly, we'll
Expand Down
17 changes: 4 additions & 13 deletions Tools/Scripts/webkitdirs.pm
Expand Up @@ -313,13 +313,9 @@ sub determineArchitecture
if ($architecture) {
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;
}
}
Expand Down Expand Up @@ -1354,11 +1350,6 @@ sub osXVersion()
return $osXVersion;
}

sub isLeopard()
{
return isDarwin() && osXVersion()->{"minor"} == 5;
}

sub isSnowLeopard()
{
return isDarwin() && osXVersion()->{"minor"} == 6;
Expand Down Expand Up @@ -2488,7 +2479,7 @@ EOF
sub argumentsForRunAndDebugMacWebKitApp()
{
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;
}

Expand Down

0 comments on commit 04bdd76

Please sign in to comment.