From 5f428850d58d9e68e11005824195414902487d0e Mon Sep 17 00:00:00 2001 From: "rniwa@webkit.org" Date: Tue, 11 Jun 2013 20:03:08 +0000 Subject: [PATCH] Add an option to run-webkit-tests to skip java dependency check https://bugs.webkit.org/show_bug.cgi?id=117516 Reviewed by Andreas Kling. * Scripts/webkitpy/layout_tests/run_webkit_tests.py: (parse_args): * Scripts/webkitpy/port/mac.py: (MacPort._check_port_build): git-svn-id: https://svn.webkit.org/repository/webkit/trunk@151462 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Tools/ChangeLog | 12 ++++++++++++ .../webkitpy/layout_tests/run_webkit_tests.py | 4 +++- Tools/Scripts/webkitpy/port/mac.py | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Tools/ChangeLog b/Tools/ChangeLog index 0de0762a6511..60ee0f2aae33 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,15 @@ +2013-06-11 Ryosuke Niwa + + Add an option to run-webkit-tests to skip java dependency check + https://bugs.webkit.org/show_bug.cgi?id=117516 + + Reviewed by Andreas Kling. + + * Scripts/webkitpy/layout_tests/run_webkit_tests.py: + (parse_args): + * Scripts/webkitpy/port/mac.py: + (MacPort._check_port_build): + 2013-06-11 Alex Christensen https://bugs.webkit.org/show_bug.cgi?id=117514 diff --git a/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py b/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py index 8b1c1132667a..6b4bb76d1e1a 100644 --- a/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py +++ b/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py @@ -196,7 +196,9 @@ def parse_args(args): optparse.make_option("--nocheck-sys-deps", action="store_true", default=False, help="Don't check the system dependencies (themes)"), - + optparse.make_option("--nojava", action="store_true", + default=False, + help="Don't build java support files"), ])) option_group_definitions.append(("Testing Options", [ diff --git a/Tools/Scripts/webkitpy/port/mac.py b/Tools/Scripts/webkitpy/port/mac.py index 913905b2831d..0b24ce70ece7 100644 --- a/Tools/Scripts/webkitpy/port/mac.py +++ b/Tools/Scripts/webkitpy/port/mac.py @@ -168,7 +168,7 @@ class MacPort(ApplePort): _log.info("%s unique leaks found!" % unique_leaks) def _check_port_build(self): - return self._build_java_test_support() + return self.get_option('nojava') or self._build_java_test_support() def _path_to_webcore_library(self): return self._build_path('WebCore.framework/Versions/A/WebCore') -- 2.36.0