Bug 979650 - Always build with Marionette for Firefox, b2g desktop, r=ted

b2g/app/moz.build

@@ -17,9 +17,6 @@ if not CONFIG['LIBXUL_SDK']:
         # a console application.
         WIN32_EXE_LDFLAGS += ['-ENTRY:wmainCRTStartup']
 
-if CONFIG['ENABLE_MARIONETTE']:
-    DEFINES['ENABLE_MARIONETTE'] = 1
-
 DEFINES['XPCOM_GLUE'] = True
 
 for var in ('MOZ_APP_NAME', 'MOZ_APP_VERSION', 'MOZ_UPDATER', 'MOZ_SERVICES_FXACCOUNTS'):

b2g/config/mozconfigs/linux32_gecko/nightly

@@ -26,7 +26,6 @@ export MOZ_TELEMETRY_REPORTING=1
 
 #B2G options
 ac_add_options --enable-application=b2g
-ENABLE_MARIONETTE=1
 ac_add_options --disable-elf-hack
 export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
 

b2g/config/mozconfigs/linux64_gecko/nightly

@@ -26,7 +26,6 @@ export MOZ_TELEMETRY_REPORTING=1
 
 #B2G options
 ac_add_options --enable-application=b2g
-ENABLE_MARIONETTE=1
 ac_add_options --disable-elf-hack
 export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
 

b2g/config/mozconfigs/macosx64_gecko/nightly

@@ -21,8 +21,6 @@ ac_add_options --enable-warnings-as-errors
 ac_add_options --enable-application=b2g
 ac_add_options --enable-debug-symbols
 . "$topsrcdir/build/mozconfig.cache"
-ENABLE_MARIONETTE=1
-
 export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
 
 GAIADIR=$topsrcdir/gaia

b2g/config/mozconfigs/win32_gecko/nightly

@@ -21,8 +21,6 @@ fi
 
 # B2G Options
 ac_add_options --enable-application=b2g
-ENABLE_MARIONETTE=1
-
 export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
 
 GAIADIR=$topsrcdir/gaia

b2g/installer/package-manifest.in

@@ -757,7 +757,7 @@ bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@
 @BINPATH@/chrome/chrome.manifest
 @BINPATH@/components/B2GComponents.manifest
 @BINPATH@/@DLL_PREFIX@omxplugin@DLL_SUFFIX@
-#ifdef ENABLE_MARIONETTE
+#if defined(ENABLE_MARIONETTE) || !defined(MOZ_WIDGET_GONK)
 @BINPATH@/chrome/marionette@JAREXT@
 @BINPATH@/chrome/marionette.manifest
 @BINPATH@/components/MarionetteComponents.manifest

browser/app/moz.build

@@ -12,9 +12,6 @@ SOURCES += [
     'nsBrowserApp.cpp',
 ]
 
-if CONFIG['ENABLE_MARIONETTE']:
-    DEFINES['ENABLE_MARIONETTE'] = 1
-
 DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
 
 for var in ('MOZILLA_OFFICIAL', 'LIBXUL_SDK'):

configure.in

@@ -8300,6 +8300,17 @@ if test "$NECKO_COOKIES"; then
     _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_COOKIES"
 fi
 
+dnl
+dnl Always build Marionette if not Android or B2G
+dnl
+if test "$OS_TARGET" != Android -a x"$MOZ_WIDGET_TOOLKIT" != x"gonk"; then
+    AC_DEFINE(ENABLE_MARIONETTE)
+fi
+AC_SUBST(ENABLE_MARIONETTE)
+if test "$ENABLE_MARIONETTE"; then
+    AC_DEFINE(ENABLE_MARIONETTE)
+fi
+
 dnl
 dnl Build jsctypes on the platforms we can, unless it's explicitly disabled.
 dnl
@@ -8441,7 +8452,6 @@ AC_SUBST(KEYTOOL)
 AC_SUBST(MOZ_PROFILELOCKING)
 
 AC_SUBST(ENABLE_TESTS)
-AC_SUBST(ENABLE_MARIONETTE)
 AC_SUBST(IBMBIDI)
 AC_SUBST(MOZ_UNIVERSALCHARDET)
 AC_SUBST(ACCESSIBILITY)

layout/tools/reftest/b2g_desktop.py

@@ -125,7 +125,7 @@ class B2GDesktopReftest(RefTest):
 
     def build_command_line(self, app, ignore_window_size=False):
         cmd = os.path.abspath(app)
-        args = []
+        args = ['-marionette']
 
         if not ignore_window_size:
             args.extend(['--screen', '800x1000'])

testing/marionette/mach_commands.py

@@ -16,13 +16,6 @@ from mach.decorators import (
     Command,
 )
 
-MARIONETTE_DISABLED = '''
-The %s command requires a Marionette-enabled build.
-
-Add 'ENABLE_MARIONETTE=1' to your mozconfig file and re-build the application.
-Your currently active mozconfig is %s.
-'''.lstrip()
-
 MARIONETTE_DISABLED_B2G = '''
 The %s command requires a Marionette-enabled build.
 
@@ -108,11 +101,6 @@ class MachCommands(MachCommandBase):
     @CommandArgument('tests', nargs='*', metavar='TESTS',
         help='Path to test(s) to run.')
     def run_marionette_test(self, tests, address=None, testtype=None):
-        if self.substs.get('ENABLE_MARIONETTE') != '1':
-            print(MARIONETTE_DISABLED % ('marionette-test',
-                                         self.mozconfig['path']))
-            return 1
-
         bin = self.get_binary_path('app')
         return run_marionette(tests, bin=bin, testtype=testtype,
             topsrcdir=self.topsrcdir, address=address)

testing/mochitest/mach_commands.py

@@ -57,12 +57,6 @@ If you do not have a non-debug gaia profile, you can build one:
 The profile should be generated in a directory called 'profile'.
 '''.lstrip()
 
-MARIONETTE_DISABLED = '''
-The %s command requires a marionette enabled build.
-
-Add 'ENABLE_MARIONETTE=1' to your mozconfig file and re-build the application.
-Your currently active mozconfig is %s.
-'''.lstrip()
 
 class UnexpectedFilter(logging.Filter):
     def filter(self, record):
@@ -153,10 +147,6 @@ class MochitestRunner(MozbuildObject):
 
         options.consoleLevel = 'INFO'
         if conditions.is_b2g_desktop(self):
-            if self.substs.get('ENABLE_MARIONETTE') != '1':
-                print(MARIONETTE_DISABLED % ('mochitest-b2g-desktop',
-                                             self.mozconfig['path']))
-                return 1
 
             options.profile = options.profile or os.environ.get('GAIA_PROFILE')
             if not options.profile:

testing/mochitest/runtestsb2g.py

@@ -372,6 +372,8 @@ def run_desktop_mochitests(parser, options):
     if options.desktop and not options.profile:
         raise Exception("must specify --profile when specifying --desktop")
 
+    options.browserArgs += ['-marionette']
+
     sys.exit(mochitest.runTests(options, onLaunch=mochitest.startTests))
 
 def main():