Backed out 2 changesets (bug 1414401) for almost perma failing webdriver's /webdriver/tests/actions/key_shortcuts.py on Linux 32-bit. r=backout

Backed out changeset 331c5f0d914e (bug 1414401)
Backed out changeset 34708561a45c (bug 1414401)
This commit is contained in:
Sebastian Hengst 2017-11-11 01:00:26 +02:00
Родитель 4f21c8fc57
Коммит 87edeab9cb
2 изменённых файлов: 5 добавлений и 4 удалений

Просмотреть файл

@ -300,7 +300,6 @@ linux32-tests:
- reftest-no-accel
- web-platform-tests
- web-platform-tests-reftests
- web-platform-tests-wdspec
- xpcshell
linux32-opt-tests:

Просмотреть файл

@ -1114,8 +1114,9 @@ option('--enable-geckodriver', help='Enable WebDriver implementation')
'MOZ_AUTOMATION',
compile_environment,
cross_compiling,
hazard_analysis)
def geckodriver(enable, automation, compile_env, cross_compile, hazard):
hazard_analysis,
target)
def geckodriver(enable, automation, compile_env, cross_compile, hazard, target):
"""
geckodriver is implied on supported platforms when MOZ_AUTOMATION
is set, but we also provide the --enable-geckodriver option for
@ -1133,7 +1134,8 @@ def geckodriver(enable, automation, compile_env, cross_compile, hazard):
return True
if enable.origin == 'default':
broken_platforms = cross_compile or hazard
linux32 = target.kernel == 'Linux' and target.cpu == 'x86'
broken_platforms = cross_compile or linux32 or hazard
if automation and compile_env and not broken_platforms:
return True