Changeset 246662 in webkit

Timestamp:

Jun 20, 2019 4:13:00 PM (5 years ago)

Author:

dean_johnson@apple.com

Message:

test-webkitpy is broken on macOS Catalina
​https://bugs.webkit.org/show_bug.cgi?id=199078

Reviewed by Jonathan Bedard.

• 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.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/test/main.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+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 Jonathan Bedard.
+
+        * 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-20  Dean Johnson  <dean_johnson@apple.com>
 

trunk/Tools/Scripts/webkitpy/test/main.py

@@ -70 +70 @@
 
     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)
@@ -97 +100 @@
 
     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')