Bug 1414401 - Enable geckodriver on Linux i686 r=ted,whimboo
☠☠ backed out by 06c7f50b73ae ☠ ☠
authorAndreas Tolfsen <ato@sny.no>
Fri, 03 Nov 2017 14:13:06 +0000
changeset 444597 34708561a45cb9eded4866fa3ca1f1101e6f7c81
parent 444596 2302ac35732fe1b030bf97203cc52c580a07a474
child 444598 331c5f0d914ed183b52e5dcee72f8f31281cdde0
push id1618
push userCallek@gmail.com
push dateThu, 11 Jan 2018 17:45:48 +0000
treeherdermozilla-release@882ca853e05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted, whimboo
bugs1414401
milestone58.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 1414401 - Enable geckodriver on Linux i686 r=ted,whimboo This patch enables building of geckodriver in CI on Linux i686. MozReview-Commit-ID: GkdHDJrzh2X
toolkit/moz.configure
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -1109,19 +1109,18 @@ set_config('ENABLE_MARIONETTE', marionet
 # geckodriver WebDriver implementation
 # ==============================================================
 option('--enable-geckodriver', help='Enable WebDriver implementation')
 
 @depends('--enable-geckodriver',
          'MOZ_AUTOMATION',
          compile_environment,
          cross_compiling,
-         hazard_analysis,
-         target)
-def geckodriver(enable, automation, compile_env, cross_compile, hazard, target):
+         hazard_analysis)
+def geckodriver(enable, automation, compile_env, cross_compile, hazard):
     """
     geckodriver is implied on supported platforms when MOZ_AUTOMATION
     is set, but we also provide the --enable-geckodriver option for
     developers to use.
 
     At the present time, we want individual developers to be able to
     opt-in to building geckodriver locally, and for it to be enabled by
     default on supported CI build platforms.
@@ -1129,18 +1128,17 @@ def geckodriver(enable, automation, comp
     if enable:
         if not compile_env:
             die("--enable-geckodriver is not available without a compile "
                 "environment. A geckodriver binary will be downloaded during "
                 "an artifact build by default where available.")
         return True
 
     if enable.origin == 'default':
-        linux32 = target.kernel == 'Linux' and target.cpu == 'x86'
-        broken_platforms = cross_compile or linux32 or hazard
+        broken_platforms = cross_compile or hazard
 
         if automation and compile_env and not broken_platforms:
             return True
 
 set_config('ENABLE_GECKODRIVER', geckodriver)
 
 # WebRTC
 # ========================================================