Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out 4 changesets (bug 1417646) for Webdriver missing geckodriver binary, at least on Linux x64 asan

Browse Source 
Backed out changeset 1c7e3f8af2e3 (bug 1417646)
Backed out changeset 42ea09d91d7e (bug 1417646)
Backed out changeset 1a3c37471045 (bug 1417646)
Backed out changeset 7179a078b7b4 (bug 1417646)
This commit is contained in:
Sebastian Hengst 2018-08-30 12:54:45 +03:00
parent c33fde86d8
commit ceebee3842
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/macosx/cross-mozconfig.common
View File

@ -10,9 +10,6 @@ if [ "x$IS_NIGHTLY" = "xyes" ]; then
fi
. "$topsrcdir/build/mozconfig.common"
# Rust requires dsymutil into PATH
mk_add_options "export PATH=$topsrcdir/llvm-dsymutil/bin:$PATH"
# ld needs libLTO.so from llvm
mk_add_options "export LD_LIBRARY_PATH=$topsrcdir/clang/lib"

7
build/unix/mozconfig.linux32
View File

@ -6,3 +6,10 @@ CFLAGS="$CFLAGS -march=pentium-m -msse -msse2 -mfpmath=sse"
CXXFLAGS="$CXXFLAGS -march=pentium-m -msse -msse2 -mfpmath=sse"
ac_add_options --target=i686-pc-linux
# The linux32 builds are effectively cross-compilations, and geckodriver
# is not enabled by default on cross-compilations, because in most cases,
# the target is not something we can run binaries of, and geckodriver
# is a target binary instead of a host binary. But for linux32, we actually
# can run the target binaries, so we can manually enable geckodriver.
ac_add_options --enable-geckodriver

6
taskcluster/scripts/misc/build-llvm-dsymutil.sh
View File

@ -62,11 +62,7 @@ export LD_LIBRARY_PATH=$HOME_DIR/src/gcc/lib64
ninja llvm-dsymutil llvm-symbolizer
# Create a symbolic link since rust doesn't allow to specify a custom dsymutil.
# This should be dropped once https://github.com/rust-lang/rust/issues/52728 fixed.
ln -s llvm-dsymutil bin/dsymutil
tar --xform='s,^,llvm-dsymutil/,S' -Jcf llvm-dsymutil.tar.xz \
bin/llvm-dsymutil bin/llvm-symbolizer bin/dsymutil
tar --xform='s,^,llvm-dsymutil/,' -Jcf llvm-dsymutil.tar.xz bin/llvm-dsymutil bin/llvm-symbolizer
mkdir -p $UPLOAD_DIR
cp llvm-dsymutil.tar.xz $UPLOAD_DIR

7
toolkit/moz.configure
View File

@ -907,9 +907,9 @@ option('--enable-geckodriver', help='Enable WebDriver implementation')
@depends('--enable-geckodriver',
'MOZ_AUTOMATION',
compile_environment,
target,
cross_compiling,
hazard_analysis)
def geckodriver(enable, automation, compile_env, target, hazard):
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
@ -927,8 +927,7 @@ def geckodriver(enable, automation, compile_env, target, hazard):
return True
if enable.origin == 'default':
# Bug 1441656 for Android.
broken_platforms = hazard or target.os == 'Android'
broken_platforms = cross_compile or hazard
if automation and compile_env and not broken_platforms:
return True

2
toolkit/toolkit.mozbuild
View File

@ -165,7 +165,7 @@ if CONFIG['ENABLE_MARIONETTE']:
'/testing/marionette',
]
if CONFIG['ENABLE_GECKODRIVER'] and not (CONFIG['MOZ_ASAN'] or CONFIG['MOZ_TSAN']):
if CONFIG['ENABLE_GECKODRIVER']:
DIRS += ['/testing/geckodriver']
DIRS += [