Bug 1409739: Disable DMD on valgrind, ccov builds; fix mozconfig whitelist
MozReview-Commit-ID: BZ14eQimky
--- a/browser/config/mozconfigs/linux32/valgrind
+++ b/browser/config/mozconfigs/linux32/valgrind
@@ -1,10 +1,11 @@
. $topsrcdir/browser/config/mozconfigs/linux32/nightly
ac_add_options --enable-valgrind
+ac_add_options --disable-dmd
ac_add_options --disable-jemalloc
ac_add_options --disable-install-strip
ac_add_options --disable-gtest-in-build
# Include the override mozconfig again (even though the above includes it)
# since it's supposed to override everything.
. "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/linux64/code-coverage
+++ b/browser/config/mozconfigs/linux64/code-coverage
@@ -1,13 +1,14 @@
. "$topsrcdir/browser/config/mozconfigs/linux64/nightly"
TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
ac_add_options --disable-install-strip
+ac_add_options --disable-dmd
ac_add_options --disable-jemalloc
ac_add_options --disable-elf-hack
ac_add_options --enable-debug
ac_add_options --disable-sandbox
ac_add_options --disable-profiling
ac_add_options --enable-coverage
export CFLAGS="--coverage"
--- a/browser/config/mozconfigs/linux64/valgrind
+++ b/browser/config/mozconfigs/linux64/valgrind
@@ -1,10 +1,11 @@
. $topsrcdir/browser/config/mozconfigs/linux64/nightly
ac_add_options --enable-valgrind
+ac_add_options --disable-dmd
ac_add_options --disable-jemalloc
ac_add_options --disable-install-strip
ac_add_options --disable-gtest-in-build
# Include the override mozconfig again (even though the above includes it)
# since it's supposed to override everything.
. "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/whitelist
+++ b/browser/config/mozconfigs/whitelist
@@ -4,16 +4,17 @@ whitelist = {
'release': {},
'nightly': {},
}
all_platforms = ['win64', 'win32', 'linux32', 'linux64', 'macosx64']
for platform in all_platforms:
whitelist['nightly'][platform] = [
+ 'ac_add_options --enable-dmd',
'ac_add_options --enable-update-channel=nightly',
'ac_add_options --with-branding=browser/branding/nightly',
'ac_add_options --enable-profiling',
'mk_add_options CLIENT_PY_ARGS="--hg-options=\'--verbose --time\' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --tinderbox-print"'
]
for platform in ['linux32', 'linux64', 'macosx64']:
whitelist['nightly'][platform] += [