<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[24006] trunk/WebKitTools</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/24006">24006</a></dd>
<dt>Author</dt> <dd>aroben</dd>
<dt>Date</dt> <dd>2007-07-04 23:24:03 -0700 (Wed, 04 Jul 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Enable a Leopard-specific Skipped list.
Reviewed by Mark.
* Scripts/run-webkit-tests: Check for Leopard.
* Scripts/webkitdirs.pm: Added isTiger/isLeopard.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitToolsChangeLog">trunk/WebKitTools/ChangeLog</a></li>
<li><a href="#trunkWebKitToolsScriptsrunwebkittests">trunk/WebKitTools/Scripts/run-webkit-tests</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitdirspm">trunk/WebKitTools/Scripts/webkitdirs.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/ChangeLog (24005 => 24006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/ChangeLog 2007-07-05 06:12:57 UTC (rev 24005)
+++ trunk/WebKitTools/ChangeLog 2007-07-05 06:24:03 UTC (rev 24006)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+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.
+
</ins><span class="cx"> 2007-07-03 Adam Roben <aroben@apple.com>
</span><span class="cx">
</span><span class="cx"> Fixed update-webkit-localizable-strings to work with new extract-localizable-strings
</span></span></pre></div>
<a id="trunkWebKitToolsScriptsrunwebkittests"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/run-webkit-tests (24005 => 24006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/run-webkit-tests 2007-07-05 06:12:57 UTC (rev 24005)
+++ trunk/WebKitTools/Scripts/run-webkit-tests 2007-07-05 06:24:03 UTC (rev 24006)
</span><span class="lines">@@ -224,7 +224,9 @@
</span><span class="cx"> my $testDirectory = File::Spec->rel2abs($layoutTestsName);
</span><span class="cx"> my $platformTestDirectory = $testDirectory;
</span><span class="cx"> my $expectedDirectory = $testDirectory;
</span><del>-if (isQt()) {
</del><ins>+if (isLeopard()) {
+ $platformTestDirectory = "$testDirectory/mac/leopard";
+} elsif (isQt()) {
</ins><span class="cx"> $expectedDirectory = "LayoutTests/qt/";
</span><span class="cx"> $platformTestDirectory = $expectedDirectory;
</span><span class="cx"> } elsif (isCygwin()) {
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitdirs.pm (24005 => 24006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitdirs.pm 2007-07-05 06:12:57 UTC (rev 24005)
+++ trunk/WebKitTools/Scripts/webkitdirs.pm 2007-07-05 06:24:03 UTC (rev 24006)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> my $configurationProductDir;
</span><span class="cx"> my $sourceDir;
</span><span class="cx"> my $currentSVNRevision;
</span><ins>+my $osXVersion;
</ins><span class="cx">
</span><span class="cx"> # Variables for Win32 support
</span><span class="cx"> my $vcBuildPath;
</span><span class="lines">@@ -398,6 +399,41 @@
</span><span class="cx"> return ($^O eq "darwin");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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;
+}
+
</ins><span class="cx"> sub checkRequiredSystemConfig
</span><span class="cx"> {
</span><span class="cx"> if (isOSX()) {
</span></span></pre>
</div>
</div>
</body>
</html>