nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1339673 - Add an option to disable building the gtest xul and set it for valgrind builds in automation. r=ted

Browse source 
MozReview-Commit-ID: 1doicRjGhfY

--HG--
extra : rebase_source : 9f9cbf5c7a9f4e29e806a02c27106fbc1519fc86
This commit is contained in:
Chris Manchester 2017-02-16 10:47:55 -08:00
parent fcd910e360
commit e2e1a84cae
3 changed files with 10 additions and 2 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

1
browser/config/mozconfigs/linux32/valgrind
View file

@ -3,6 +3,7 @@
ac_add_options --enable-valgrind ac_add_options --enable-valgrind
ac_add_options --disable-jemalloc ac_add_options --disable-jemalloc
ac_add_options --disable-install-strip ac_add_options --disable-install-strip
ac_add_options --disable-gtest-in-build
# Include the override mozconfig again (even though the above includes it) # Include the override mozconfig again (even though the above includes it)
# since it's supposed to override everything. # since it's supposed to override everything.

1
browser/config/mozconfigs/linux64/valgrind
View file

@ -3,6 +3,7 @@
ac_add_options --enable-valgrind ac_add_options --enable-valgrind
ac_add_options --disable-jemalloc ac_add_options --disable-jemalloc
ac_add_options --disable-install-strip ac_add_options --disable-install-strip
ac_add_options --disable-gtest-in-build
# Include the override mozconfig again (even though the above includes it) # Include the override mozconfig again (even though the above includes it)
# since it's supposed to override everything. # since it's supposed to override everything.

10
moz.configure
View file

@ -157,12 +157,18 @@ def build_backends(backends):
set_config('BUILD_BACKENDS', build_backends) set_config('BUILD_BACKENDS', build_backends)
option('--disable-gtest-in-build',
help='Force disable building the gtest libxul during the build.',
when='--enable-compile-environment')
# Determine whether to build the gtest xul. This happens in automation # Determine whether to build the gtest xul. This happens in automation
# on Desktop platforms with the exception of Windows PGO, where linking # on Desktop platforms with the exception of Windows PGO, where linking
# xul-gtest.dll takes too long. # xul-gtest.dll takes too long.
@depends('MOZ_PGO', build_project, target, 'MOZ_AUTOMATION', @depends('MOZ_PGO', build_project, target, 'MOZ_AUTOMATION', '--disable-gtest-in-build',
when='--enable-compile-environment') when='--enable-compile-environment')
def build_gtest(pgo, build_project, target, automation): def build_gtest(pgo, build_project, target, automation, enabled):
if not enabled:
return None
if (automation and build_project == 'browser' and if (automation and build_project == 'browser' and
not (pgo and target.os == 'WINNT')): not (pgo and target.os == 'WINNT')):
return True return True