<!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>[56279] trunk</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/56279">56279</a></dd>
<dt>Author</dt> <dd>dpranke@chromium.org</dd>
<dt>Date</dt> <dd>2010-03-19 16:02:48 -0700 (Fri, 19 Mar 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>2010-03-19  Dirk Pranke  &lt;dpranke@chromium.org&gt;

        Reviewed by Dimitri Glazkov.

        Flip the Chromium ports to look first for the test expectations
        in LayoutTests/platform/chromium and only afterwards look in the
        Chromium repo downstream for overrides.

        https://bugs.webkit.org/show_bug.cgi?id=36326

        * WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py:
        * LayoutTests/platform/chromium/test_expectations.txt</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkWebKitToolsChangeLog">trunk/WebKitTools/ChangeLog</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpylayout_testsportchromiumpy">trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (56278 => 56279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2010-03-19 22:52:55 UTC (rev 56278)
+++ trunk/LayoutTests/ChangeLog        2010-03-19 23:02:48 UTC (rev 56279)
</span><span class="lines">@@ -2,6 +2,16 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Dimitri Glazkov.
</span><span class="cx"> 
</span><ins>+        Add test_expectations.txt file for chromium baselines
+
+        https://bugs.webkit.org/show_bug.cgi?id=28397
+
+        * platform/chromium/test_expectations.txt: Added
+
+2010-03-19  Dirk Pranke &lt;dpranke@chromium.org&gt;
+
+        Reviewed by Dimitri Glazkov.
+
</ins><span class="cx">         Land remaining chromium-linux LayoutTest baselines
</span><span class="cx">         (file list omitted due to length).
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebKitToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/ChangeLog (56278 => 56279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/ChangeLog        2010-03-19 22:52:55 UTC (rev 56278)
+++ trunk/WebKitTools/ChangeLog        2010-03-19 23:02:48 UTC (rev 56279)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2010-03-19  Dirk Pranke  &lt;dpranke@chromium.org&gt;
+
+        Reviewed by Dimitri Glazkov.
+
+        Flip the Chromium ports to look first for the test expectations
+        in LayoutTests/platform/chromium and only afterwards look in the
+        Chromium repo downstream for overrides.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36326
+
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+
</ins><span class="cx"> 2010-03-19  James Hawkins  &lt;jhawkins@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Unreviewed.
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpylayout_testsportchromiumpy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py (56278 => 56279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py        2010-03-19 22:52:55 UTC (rev 56278)
+++ trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py        2010-03-19 23:02:48 UTC (rev 56279)
</span><span class="lines">@@ -114,8 +114,8 @@
</span><span class="cx">         return os.path.join(self._chromium_base_dir, *comps)
</span><span class="cx"> 
</span><span class="cx">     def path_to_test_expectations_file(self):
</span><del>-        return self.path_from_chromium_base('webkit', 'tools', 'layout_tests',
-                                            'test_expectations.txt')
</del><ins>+        return self.path_from_webkit_base('LayoutTests', 'platform',
+            'chromium', 'test_expectations.txt')
</ins><span class="cx"> 
</span><span class="cx">     def results_directory(self):
</span><span class="cx">         return self.path_from_chromium_base('webkit', self._options.target,
</span><span class="lines">@@ -165,6 +165,14 @@
</span><span class="cx">         expectations_file = self.path_to_test_expectations_file()
</span><span class="cx">         return file(expectations_file, &quot;r&quot;).read()
</span><span class="cx"> 
</span><ins>+    def test_expectations_overrides(self):
+        overrides_file = self.path_from_chromium_base('webkit', 'tools',
+            'layout_tests', 'test_expectations.txt')
+        if os.path.exists(overrides_file):
+            return file(expectations_file, &quot;r&quot;).read()
+        else:
+            return None
+
</ins><span class="cx">     def test_platform_names(self):
</span><span class="cx">         return self.test_base_platform_names() + ('win-xp',
</span><span class="cx">             'win-vista', 'win-7')
</span></span></pre>
</div>
</div>

</body>
</html>