Title: [113929] trunk/Tools
- Revision
- 113929
- Author
- [email protected]
- Date
- 2012-04-11 17:43:14 -0700 (Wed, 11 Apr 2012)
Log Message
Fix regression introduced in r113927.
Unreviewed, build fix.
I failed to rename skipped_tests() to skipped_layout_tests()
everywhere it needed to be renamed. The unit tests didn't catch
this because the TestPort was one of the places that didn't get
renamed :(.
* Scripts/webkitpy/layout_tests/controllers/manager.py:
(Manager.parse_expectations):
* Scripts/webkitpy/layout_tests/port/test.py:
(TestPort.skipped_layout_tests):
* Scripts/webkitpy/tool/commands/queries.py:
(PrintExpectations._model):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (113928 => 113929)
--- trunk/Tools/ChangeLog 2012-04-12 00:29:34 UTC (rev 113928)
+++ trunk/Tools/ChangeLog 2012-04-12 00:43:14 UTC (rev 113929)
@@ -1,5 +1,23 @@
2012-04-11 Dirk Pranke <[email protected]>
+ Fix regression introduced in r113927.
+
+ Unreviewed, build fix.
+
+ I failed to rename skipped_tests() to skipped_layout_tests()
+ everywhere it needed to be renamed. The unit tests didn't catch
+ this because the TestPort was one of the places that didn't get
+ renamed :(.
+
+ * Scripts/webkitpy/layout_tests/controllers/manager.py:
+ (Manager.parse_expectations):
+ * Scripts/webkitpy/layout_tests/port/test.py:
+ (TestPort.skipped_layout_tests):
+ * Scripts/webkitpy/tool/commands/queries.py:
+ (PrintExpectations._model):
+
+2012-04-11 Dirk Pranke <[email protected]>
+
new-run-webkit-tests: 'webkit-patch skipped-ports' introduced bad layering
https://bugs.webkit.org/show_bug.cgi?id=47528
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py (113928 => 113929)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2012-04-12 00:29:34 UTC (rev 113928)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2012-04-12 00:43:14 UTC (rev 113929)
@@ -369,7 +369,7 @@
port.test_configuration(),
self._options.lint_test_files,
port.test_expectations_overrides(),
- port.skipped_tests(self._test_files).union(tests_to_ignore))
+ port.skipped_layout_tests(self._test_files).union(tests_to_ignore))
def _split_into_chunks_if_necessary(self, skipped):
if not self._options.run_chunk and not self._options.run_part:
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py (113928 => 113929)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py 2012-04-12 00:29:34 UTC (rev 113928)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py 2012-04-12 00:43:14 UTC (rev 113929)
@@ -399,7 +399,7 @@
def webkit_base(self):
return '/test.checkout'
- def skipped_tests(self, test_list):
+ def skipped_layout_tests(self, test_list):
# This allows us to test the handling Skipped files, both with a test
# that actually passes, and a test that does fail.
return set(['failures/expected/skip_text.html',
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/queries.py (113928 => 113929)
--- trunk/Tools/Scripts/webkitpy/tool/commands/queries.py 2012-04-12 00:29:34 UTC (rev 113928)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/queries.py 2012-04-12 00:43:14 UTC (rev 113929)
@@ -462,7 +462,7 @@
port.test_configuration(),
lint_mode,
port.test_expectations_overrides(),
- port.skipped_tests(tests)).model()
+ port.skipped_layout_tests(tests)).model()
return self._expectation_models[expectations_path]
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
