Attachment 358909 Details for Bug 193352 – Patch for landing

[patch] Patch for landing

bug-193352-20190111104505.patch (text/plain), 3.35 KB, created by Jonathan Bedard on 2019-01-11 10:45:06 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Bedard

Created: 2019-01-11 10:45:06 PST

Size: 3.35 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 239864)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,16 @@
>+2019-01-11  Jonathan Bedard  <jbedard@apple.com>
>+
>+        webkitpy: Print abbreviated baseline search path that includes only folders that exist
>+        https://bugs.webkit.org/show_bug.cgi?id=193352
>+        <rdar://problem/47210736>
>+
>+        Reviewed by Lucas Forschler.
>+
>+        * Scripts/webkitpy/layout_tests/views/printing.py:
>+        (Printer.print_config): Print list on only baseline search paths which exist. 
>+        * Scripts/webkitpy/layout_tests/views/printing_unittest.py:
>+        (Testprinter.test_print_config):
>+
> 2019-01-11  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         Introduce IDL files for runtime-enabled UndoManager and UndoItem JavaScript API
>Index: Tools/Scripts/webkitpy/layout_tests/views/printing.py
>===================================================================
>--- Tools/Scripts/webkitpy/layout_tests/views/printing.py	(revision 239864)
>+++ Tools/Scripts/webkitpy/layout_tests/views/printing.py	(working copy)
>@@ -82,8 +82,14 @@ class Printer(object):
>             self._print_default("Placing new baselines in %s" % self._port.baseline_path())
> 
>         fs = self._port.host.filesystem
>-        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))
>+        full_baseline_search_path = self._port.baseline_search_path()
>+        normalize_baseline = lambda baseline_search_path: [fs.relpath(x, self._port.layout_tests_dir()).replace("../", "") for x in baseline_search_path]
>+
>+        self._print_default('Verbose baseline search path: {} -> generic'.format(' -> '.join(normalize_baseline(full_baseline_search_path))))
>+
>+        self._print_default('')
>+        self._print_default('Baseline search path: {} -> generic'.format(' -> '.join(normalize_baseline([path for path in full_baseline_search_path if fs.exists(path)]))))
>+        self._print_default('')
> 
>         self._print_default("Using %s build" % self._options.configuration)
>         if self._options.pixel_tests:
>Index: Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py
>===================================================================
>--- Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py	(revision 239864)
>+++ Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py	(working copy)
>@@ -111,7 +111,8 @@ class  Testprinter(unittest.TestCase):
>         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: platform/test-mac-leopard -> platform/test-mac-snowleopard -> generic', err.getvalue())
>+        self.assertIn('Verbose baseline search path: platform/test-mac-leopard -> platform/test-mac-snowleopard -> generic', err.getvalue())
>+        self.assertIn('Baseline search path: platform/test-mac-leopard -> generic', err.getvalue())
>         self.assertIn('Using Release build', err.getvalue())
>         self.assertIn('Pixel tests enabled', err.getvalue())
>         self.assertIn('Command line:', err.getvalue())

Actions: View | Formatted Diff | Diff

Attachments on bug 193352: 358901 | 358903 | 358904 | 358909