Title: [246662] trunk/Tools
- Revision
- 246662
- Author
- dean_john...@apple.com
- Date
- 2019-06-20 16:13:00 -0700 (Thu, 20 Jun 2019)
Log 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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (246661 => 246662)
--- trunk/Tools/ChangeLog 2019-06-20 22:58:30 UTC (rev 246661)
+++ trunk/Tools/ChangeLog 2019-06-20 23:13:00 UTC (rev 246662)
@@ -1,5 +1,17 @@
2019-06-20 Dean Johnson <dean_john...@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_john...@apple.com>
+
Change status to "committer" in contributors.json
Unreviewed.
Modified: trunk/Tools/Scripts/webkitpy/test/main.py (246661 => 246662)
--- trunk/Tools/Scripts/webkitpy/test/main.py 2019-06-20 22:58:30 UTC (rev 246661)
+++ trunk/Tools/Scripts/webkitpy/test/main.py 2019-06-20 23:13:00 UTC (rev 246662)
@@ -69,14 +69,17 @@
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 @@
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]}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
