Bug 1368035 - Correct description of Marionette in toolkit configure; r=automatedtester
authorAndreas Tolfsen <ato@mozilla.com>
Fri, 26 May 2017 16:27:07 +0100
changeset 409441 ed5505b795eac0d3609e2f2ea9fe556490a30c5f
parent 409440 4c6b36ee9f171c7a3831e30309a925cfe710d329
child 409442 ba93b845139510e6eaf5a1e6eee585b6c5b1ddbe
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersautomatedtester
bugs1368035
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1368035 - Correct description of Marionette in toolkit configure; r=automatedtester MozReview-Commit-ID: B16umNXSOZ
toolkit/moz.configure
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -1051,40 +1051,42 @@ def skia_includes(skia, skia_gpu):
 set_config('SKIA_INCLUDES', skia_includes)
 
 # Mortar
 # ==============================================================
 option('--enable-mortar', help='Enable mortar extension')
 
 set_config('MOZ_MORTAR', True, when='--enable-mortar')
 
-# Marionette is a Web Driver / Selenium comamnd server and client automation
-# driver for Mozilla's Gecko engine.  For more, see
+# Marionette remote protocol
+# ==============================================================
+#
+# Marionette is the Gecko remote protocol used for various remote control,
+# automation, and testing purposes throughout Gecko, Firefox, and Fennec.
+# Marionette lives in ../testing/marionette.
+#
+# Marionette is not really a toolkit feature, as much as a Gecko engine
+# feature.  But it is enabled based on the toolkit (and target), so here
+# it lives.
+#
+# It also backs ../testing/geckodriver, which is Mozilla's WebDriver
+# implementation.
+#
+# For more information, see
 # https://developer.mozilla.org/en-US/docs/Mozilla/QA/Marionette.
-#
-# Marionette isn't really a toolkit feature, it's a Gecko engine feature, but
-# it's enabled based on the toolkit (and target), so here it lives.
 
 @depends(target)
-def marionette_default(target):
-    # By default, enable Marionette if not Android.
-    #
-    # None means "don't set anything", which allows to override with
-    # --enable-marionette.  False means --disable-marionette, which
-    # cannot be overridden with --enable-marionette.  We want to allow
-    # overrides.
-    if target.os == 'Android':
-        return None
+def marionette(target):
+    """Enable Marionette by default, except on Android."""
+    if target.os != 'Android':
+        return True
 
-    return True
-
-imply_option('--enable-marionette', marionette_default,
-             reason='not Android')
+imply_option('--enable-marionette', marionette, reason='Not Android')
 
 option('--enable-marionette',
-       help='Enable internal Marionette command server')
+       help='Enable Marionette remote protocol')
 
 @depends('--enable-marionette')
 def marionette(value):
     if value:
         return True
 
 set_config('ENABLE_MARIONETTE', marionette)