<!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" />
<title>[59364] trunk/WebKitTools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/59364">59364</a></dd>
<dt>Author</dt> <dd>eric@webkit.org</dd>
<dt>Date</dt> <dd>2010-05-13 07:39:02 -0700 (Thu, 13 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>2010-05-13 Eric Seidel <eric@webkit.org>
Unreviewed hack, attempting to get the commit-queue running again.
Disable compositing/iframes tests on the commit-queue as a workaround for bug 38912
https://bugs.webkit.org/show_bug.cgi?id=39067
I had this hack locally on the commit-queue, but it's fragile
and broke this morning. It will work much better if committed
to the repository. In either case it's temporary while we
work up a real fix for bug 38912.
* Scripts/webkitpy/common/config/ports.py:
- Expose an is_leopard() method.
* Scripts/webkitpy/tool/steps/runtests.py:
- Don't run compositing/iframes tests on the commit-queue under leopard.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitToolsChangeLog">trunk/WebKitTools/ChangeLog</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpycommonconfigportspy">trunk/WebKitTools/Scripts/webkitpy/common/config/ports.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpytoolstepsruntestspy">trunk/WebKitTools/Scripts/webkitpy/tool/steps/runtests.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/ChangeLog (59363 => 59364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/ChangeLog 2010-05-13 14:35:03 UTC (rev 59363)
+++ trunk/WebKitTools/ChangeLog 2010-05-13 14:39:02 UTC (rev 59364)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2010-05-13 Eric Seidel <eric@webkit.org>
+
+ Unreviewed hack, attempting to get the commit-queue running again.
+
+ Disable compositing/iframes tests on the commit-queue as a workaround for bug 38912
+ https://bugs.webkit.org/show_bug.cgi?id=39067
+
+ I had this hack locally on the commit-queue, but it's fragile
+ and broke this morning. It will work much better if committed
+ to the repository. In either case it's temporary while we
+ work up a real fix for bug 38912.
+
+ * Scripts/webkitpy/common/config/ports.py:
+ - Expose an is_leopard() method.
+ * Scripts/webkitpy/tool/steps/runtests.py:
+ - Don't run compositing/iframes tests on the commit-queue under leopard.
+
</ins><span class="cx"> 2010-05-13 Fumitoshi Ukai <ukai@chromium.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed fix. Revert previous change.
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpycommonconfigportspy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/common/config/ports.py (59363 => 59364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/common/config/ports.py 2010-05-13 14:35:03 UTC (rev 59363)
+++ trunk/WebKitTools/Scripts/webkitpy/common/config/ports.py 2010-05-13 14:39:02 UTC (rev 59364)
</span><span class="lines">@@ -112,7 +112,17 @@
</span><span class="cx"> def flag(cls):
</span><span class="cx"> return "--port=mac"
</span><span class="cx">
</span><ins>+ @classmethod
+ def _system_version(cls):
+ version_string = platform.mac_ver()[0] # e.g. "10.5.6"
+ version_tuple = version_string.split('.')
+ return map(int, version_tuple)
</ins><span class="cx">
</span><ins>+ @classmethod
+ def is_leopard(cls):
+ return tuple(cls._system_version()[:2]) == (10.5)
+
+
</ins><span class="cx"> class WinPort(WebKitPort):
</span><span class="cx">
</span><span class="cx"> @classmethod
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpytoolstepsruntestspy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/tool/steps/runtests.py (59363 => 59364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/tool/steps/runtests.py 2010-05-13 14:35:03 UTC (rev 59363)
+++ trunk/WebKitTools/Scripts/webkitpy/tool/steps/runtests.py 2010-05-13 14:39:02 UTC (rev 59364)
</span><span class="lines">@@ -57,6 +57,11 @@
</span><span class="cx"> if self._options.non_interactive:
</span><span class="cx"> args.append("--no-launch-safari")
</span><span class="cx"> args.append("--exit-after-n-failures=1")
</span><ins>+ # FIXME: Hack to work around https://bugs.webkit.org/show_bug.cgi?id=38912
+ # when running the commit-queue on a mac leopard machine.
+ if self.port().name() == "mac" and self.port().is_leopard():
+ args.extend(["--ignore-tests", "compositing/iframes"])
+
</ins><span class="cx"> if self._options.quiet:
</span><span class="cx"> args.append("--quiet")
</span><span class="cx"> self._tool.executive.run_and_throw_if_fail(args)
</span></span></pre>
</div>
</div>
</body>
</html>