Attachment 372581 Details for Bug 199078 – Patch

[patch] Patch

bug-199078-20190620140400.patch (text/plain), 2.71 KB, created by Dean Johnson on 2019-06-20 14:04:01 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Dean Johnson

Created: 2019-06-20 14:04:01 PDT

Size: 2.71 KB

patch

obsolete

>Subversion Revision: 246612
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index f876061551dcfdc7d86d2e552461e8004ba0d4ff..5b5df6ae4f7f6beda04db38dee5c397963d83f00 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-06-20  Dean Johnson  <dean_johnson@apple.com>
>+
>+        test-webkitpy is broken on macOS Catalina
>+        https://bugs.webkit.org/show_bug.cgi?id=199078
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/webkitpy/test/main.py: Check if lldb tests are supported before adding them
>+        to the runner.
>+        (main): 
>+        (_supports_building_and_running_lldb_tests): Check if you are running macOS Catalina.
>+
> 2019-06-19  Aakash Jain  <aakash_jain@apple.com>
> 
>         [ews-build] Add step to analyze Compile WebKit failures
>diff --git a/Tools/Scripts/webkitpy/test/main.py b/Tools/Scripts/webkitpy/test/main.py
>index 1fe034aba8ec7ab431e7a357a7141b4587f67350..a8e3ae071965e62f24b0b33015af0408a271c292 100644
>--- a/Tools/Scripts/webkitpy/test/main.py
>+++ b/Tools/Scripts/webkitpy/test/main.py
>@@ -69,14 +69,17 @@ def main():
>         tester.add_tree(os.path.join(_webkit_root, 'Source', 'WebKit', 'Scripts'), 'webkit')
> 
>     lldb_python_directory = _host.path_to_lldb_python_directory()
>-    if os.path.isdir(lldb_python_directory):
>+    if not _supports_building_and_running_lldb_tests():
>+        _log.info("Skipping lldb_webkit tests; not yet supported on macOS Catalina.")
>+        will_run_lldb_webkit_tests = False
>+    elif not os.path.isdir(lldb_python_directory):
>+        _log.info("Skipping lldb_webkit tests; could not find path to lldb.py '{}'.".format(lldb_python_directory))
>+        will_run_lldb_webkit_tests = False
>+    else:
>         if lldb_python_directory not in sys.path:
>             sys.path.append(lldb_python_directory)
>         tester.add_tree(os.path.join(_webkit_root, 'Tools', 'lldb'))
>         will_run_lldb_webkit_tests = True
>-    else:
>-        _log.info("Skipping lldb_webkit tests; could not find path to lldb.py '{}'.".format(lldb_python_directory))
>-        will_run_lldb_webkit_tests = False
> 
>     tester.skip(('webkitpy.common.checkout.scm.scm_unittest',), 'are really, really, slow', 31818)
>     if sys.platform.startswith('win'):
>@@ -98,6 +101,12 @@ def main():
>     return not tester.run(will_run_lldb_webkit_tests=will_run_lldb_webkit_tests)
> 
> 
>+def _supports_building_and_running_lldb_tests():
>+    # FIXME: Remove when test-lldb is in its own script
>+    # https://bugs.webkit.org/show_bug.cgi?id=187916
>+    return not _host.platform.build_version().startswith('19A')
>+
>+
> def _print_results_as_json(stream, all_test_names, failures, errors):
>     def result_dict_from_tuple(result_tuple):
>         return {'name': result_tuple[0], 'result': result_tuple[1]}

Actions: View | Formatted Diff | Diff

Attachments on bug 199078: 372581