Title: [202819] trunk/Tools
- Revision
- 202819
- Author
- [email protected]
- Date
- 2016-07-05 09:52:26 -0700 (Tue, 05 Jul 2016)
Log Message
run-webkit-tests should print more complete baseline search paths
https://bugs.webkit.org/show_bug.cgi?id=159354
Reviewed by Daniel Bates.
run-webkit-tests used to only print directory names in baseline search paths.
This was ok in basic usage, but quickly got confusing when using
--additional-platform-directory flags.
* Scripts/webkitpy/layout_tests/views/printing.py:
(Printer.print_config):
* Scripts/webkitpy/layout_tests/views/printing_unittest.py:
(Testprinter.test_print_config):
(Testprinter.test_print_one_line_summary):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (202818 => 202819)
--- trunk/Tools/ChangeLog 2016-07-05 15:49:28 UTC (rev 202818)
+++ trunk/Tools/ChangeLog 2016-07-05 16:52:26 UTC (rev 202819)
@@ -1,3 +1,20 @@
+2016-07-05 Alexey Proskuryakov <[email protected]>
+
+ run-webkit-tests should print more complete baseline search paths
+ https://bugs.webkit.org/show_bug.cgi?id=159354
+
+ Reviewed by Daniel Bates.
+
+ run-webkit-tests used to only print directory names in baseline search paths.
+ This was ok in basic usage, but quickly got confusing when using
+ --additional-platform-directory flags.
+
+ * Scripts/webkitpy/layout_tests/views/printing.py:
+ (Printer.print_config):
+ * Scripts/webkitpy/layout_tests/views/printing_unittest.py:
+ (Testprinter.test_print_config):
+ (Testprinter.test_print_one_line_summary):
+
2016-07-04 Brady Eidson <[email protected]>
WebProcesses don't handle DatabaseProcess going away uncleanly..
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py (202818 => 202819)
--- trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py 2016-07-05 15:49:28 UTC (rev 202818)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py 2016-07-05 16:52:26 UTC (rev 202819)
@@ -82,7 +82,7 @@
self._print_default("Placing new baselines in %s" % self._port.baseline_path())
fs = self._port.host.filesystem
- fallback_path = [fs.split(x)[1] for x in self._port.baseline_search_path()]
+ fallback_path = [fs.relpath(x, self._port.layout_tests_dir()).replace("../", "") for x in self._port.baseline_search_path()]
self._print_default("Baseline search path: %s -> generic" % " -> ".join(fallback_path))
self._print_default("Using %s build" % self._options.configuration)
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py (202818 => 202819)
--- trunk/Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py 2016-07-05 15:49:28 UTC (rev 202818)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py 2016-07-05 16:52:26 UTC (rev 202819)
@@ -111,7 +111,7 @@
self.assertIn("Using port 'test-mac-leopard'", err.getvalue())
self.assertIn('Test configuration: <leopard, x86, release>', err.getvalue())
self.assertIn('Placing test results in /tmp', err.getvalue())
- self.assertIn('Baseline search path: test-mac-leopard -> test-mac-snowleopard -> generic', err.getvalue())
+ self.assertIn('Baseline search path: platform/test-mac-leopard -> platform/test-mac-snowleopard -> generic', err.getvalue())
self.assertIn('Using Release build', err.getvalue())
self.assertIn('Pixel tests enabled', err.getvalue())
self.assertIn('Command line:', err.getvalue())
@@ -120,7 +120,7 @@
self.reset(err)
printer._options.quiet = True
printer.print_config('/tmp')
- self.assertNotIn('Baseline search path: test-mac-leopard -> test-mac-snowleopard -> generic', err.getvalue())
+ self.assertNotIn('Baseline search path: platform/test-mac-leopard -> platform/test-mac-snowleopard -> generic', err.getvalue())
def test_print_one_line_summary(self):
printer, err = self.get_printer()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
