Bug 1393454 Do not compile rust gtest crate if --disable-tests is set r=ted

MozReview-Commit-ID: 1HgK0D1kGNu

--HG--
extra : rebase_source : 068c0fa81aa6c28e0999e98ce6b5300605a87acc

moz.configure

@@ -270,9 +270,9 @@ option('--disable-gtest-in-build',
 # 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', '--disable-gtest-in-build',
-         when='--enable-compile-environment')
-def build_gtest(pgo, build_project, target, automation, enabled):
-    if not enabled:
+         enable_tests, when='--enable-compile-environment')
+def build_gtest(pgo, build_project, target, automation, enabled, enable_tests):
+    if not enable_tests or not enabled:
         return None
     if (automation and build_project == 'browser' and
         not (pgo and target.os == 'WINNT')):

toolkit/library/gtest/moz.build

@@ -6,8 +6,12 @@
 
 FINAL_TARGET = 'dist/bin/gtest'
 
+if CONFIG['ENABLE_TESTS']:
+	USE_LIBS += [
+	    'gkrust-gtest',
+	]
+
 USE_LIBS += [
-    'gkrust-gtest',
     'static:xul',
     # xul-gtest is an intermediate static library. It is used as FINAL_TARGET
     # for gtest code.

toolkit/toolkit.mozbuild

@@ -4,8 +4,12 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+if CONFIG['ENABLE_TESTS']:
+    DIRS += [
+        '/toolkit/library/gtest/rust',
+    ]
+
 DIRS += [
-    '/toolkit/library/gtest/rust',
     '/toolkit/library/rust',
 ]