Bug 1339673 - Add an option to disable building the gtest xul and set it for valgrind builds in automation. r=ted a=NPOTB
authorChris Manchester <cmanchester@mozilla.com>
Thu, 16 Feb 2017 10:47:55 -0800
changeset 376579 f16426d0e0e7f0bb786f89a7774c304bce65a0fb
parent 376578 a2dd787448dc540dd1d257ed134c09af69be571e
child 376580 d9d91d6e389ef19bd48eb5153c9e32a122a1eecc
push id6996
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 20:48:21 +0000
treeherdermozilla-beta@d89512dab048 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted, NPOTB
bugs1339673
milestone53.0a2
Bug 1339673 - Add an option to disable building the gtest xul and set it for valgrind builds in automation. r=ted a=NPOTB MozReview-Commit-ID: 1doicRjGhfY
browser/config/mozconfigs/linux32/valgrind
browser/config/mozconfigs/linux64/valgrind
moz.configure
--- a/browser/config/mozconfigs/linux32/valgrind
+++ b/browser/config/mozconfigs/linux32/valgrind
@@ -1,9 +1,10 @@
 . $topsrcdir/browser/config/mozconfigs/linux32/nightly
 
 ac_add_options --enable-valgrind
 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/valgrind
+++ b/browser/config/mozconfigs/linux64/valgrind
@@ -1,9 +1,10 @@
 . $topsrcdir/browser/config/mozconfigs/linux64/nightly
 
 ac_add_options --enable-valgrind
 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/moz.configure
+++ b/moz.configure
@@ -152,22 +152,28 @@ option('--build-backends', nargs='+', de
        choices=build_backends_choices, help='Build backends to generate')
 
 @depends('--build-backends')
 def build_backends(backends):
     return 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
 # on Desktop platforms with the exception of Windows PGO, where linking
 # 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')
-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
         not (pgo and target.os == 'WINNT')):
         return True
 
 set_config('LINK_GTEST_DURING_COMPILE', build_gtest)
 
 # Awk detection
 # ==============================================================