Title: [179218] trunk/Tools
- Revision
- 179218
- Author
- [email protected]
- Date
- 2015-01-27 14:29:33 -0800 (Tue, 27 Jan 2015)
Log Message
[Mac] Disable building Java applets by default
https://bugs.webkit.org/show_bug.cgi?id=140957
rdar://problem/19619529
Reviewed by Anders Carlsson.
It was actually already disabled unconditionally, by accident.
* Scripts/webkitpy/layout_tests/run_webkit_tests.py: (parse_args):
* Scripts/webkitpy/port/mac.py:
(MacPort._check_port_build):
(MacPort._build_java_test_support):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (179217 => 179218)
--- trunk/Tools/ChangeLog 2015-01-27 22:22:24 UTC (rev 179217)
+++ trunk/Tools/ChangeLog 2015-01-27 22:29:33 UTC (rev 179218)
@@ -1,3 +1,18 @@
+2015-01-27 Alexey Proskuryakov <[email protected]>
+
+ [Mac] Disable building Java applets by default
+ https://bugs.webkit.org/show_bug.cgi?id=140957
+ rdar://problem/19619529
+
+ Reviewed by Anders Carlsson.
+
+ It was actually already disabled unconditionally, by accident.
+
+ * Scripts/webkitpy/layout_tests/run_webkit_tests.py: (parse_args):
+ * Scripts/webkitpy/port/mac.py:
+ (MacPort._check_port_build):
+ (MacPort._build_java_test_support):
+
2015-01-27 Daniel Bates <[email protected]>
[iOS] run-webkit-tests --platform=ios* --lint-test-files does not work
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py (179217 => 179218)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2015-01-27 22:22:24 UTC (rev 179217)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2015-01-27 22:29:33 UTC (rev 179218)
@@ -205,9 +205,9 @@
optparse.make_option("--nocheck-sys-deps", action=""
default=False,
help="Don't check the system dependencies (themes)"),
- optparse.make_option("--nojava", action=""
+ optparse.make_option("--java", action=""
default=False,
- help="Don't build java support files"),
+ help="Build java support files"),
]))
option_group_definitions.append(("Testing Options", [
Modified: trunk/Tools/Scripts/webkitpy/port/mac.py (179217 => 179218)
--- trunk/Tools/Scripts/webkitpy/port/mac.py 2015-01-27 22:22:24 UTC (rev 179217)
+++ trunk/Tools/Scripts/webkitpy/port/mac.py 2015-01-27 22:29:33 UTC (rev 179218)
@@ -147,7 +147,6 @@
return min(supportable_instances, default_count)
def _build_java_test_support(self):
- return True
java_tests_path = self._filesystem.join(self.layout_tests_dir(), "java")
build_java = [self.make_command(), "-C", java_tests_path]
if self._executive.run_command(build_java, return_exit_code=True): # Paths are absolute, so we don't need to set a cwd.
@@ -176,7 +175,7 @@
_log.info("%s unique leaks found." % unique_leaks)
def _check_port_build(self):
- return self.get_option('nojava') or self._build_java_test_support()
+ return not self.get_option('java') or self._build_java_test_support()
def _path_to_webcore_library(self):
return self._build_path('WebCore.framework/Versions/A/WebCore')
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
