Bug 1380665 - Define MOZ_CODE_COVERAGE for the entire tree. r=jmaher

browser/config/mozconfigs/linux64/code-coverage

@@ -9,8 +9,8 @@ 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
 
-MOZ_CODE_COVERAGE=1
 export CFLAGS="--coverage"
 export CXXFLAGS="--coverage"
 export LDFLAGS="--coverage -L$TOOLTOOL_DIR/gtk3/usr/local/lib"

dom/ipc/moz.build

@@ -163,9 +163,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2'):
 if CONFIG['MOZ_TOOLKIT_SEARCH']:
     DEFINES['MOZ_TOOLKIT_SEARCH'] = True
 
-if CONFIG['MOZ_CODE_COVERAGE']:
-    DEFINES['MOZ_CODE_COVERAGE'] = True
-
 JAR_MANIFESTS += ['jar.mn']
 
 BROWSER_CHROME_MANIFESTS += ['tests/browser.ini']

js/xpconnect/src/moz.build

@@ -64,6 +64,3 @@ LOCAL_INCLUDES += [
 
 if CONFIG['GNU_CXX']:
     CXXFLAGS += ['-Wno-shadow', '-Werror=format']
-
-if CONFIG['MOZ_CODE_COVERAGE']:
-    DEFINES['MOZ_CODE_COVERAGE'] = True

old-configure.in

@@ -5204,7 +5204,6 @@ AC_SUBST_LIST(VPX_ASFLAGS)
 AC_SUBST(VPX_AS_CONVERSION)
 AC_SUBST(VPX_X86_ASM)
 AC_SUBST(VPX_ARM_ASM)
-AC_SUBST(MOZ_CODE_COVERAGE)
 AC_SUBST(LIBJPEG_TURBO_USE_YASM)
 AC_SUBST_LIST(LIBJPEG_TURBO_ASFLAGS)
 AC_SUBST(MOZ_LIBAV_FFT)

toolkit/moz.configure

@@ -1224,3 +1224,17 @@ def geckodriver(enable, automation, compile_env, cross_compile, hazard, target):
             return True
 
 set_config('ENABLE_GECKODRIVER', geckodriver)
+
+# Code Coverage
+# ==============================================================
+
+option('--enable-coverage', env='MOZ_CODE_COVERAGE',
+       help='Enable code coverage')
+
+@depends('--enable-coverage')
+def code_coverage(value):
+    if value:
+        return True
+
+set_config('MOZ_CODE_COVERAGE', code_coverage)
+set_define('MOZ_CODE_COVERAGE', code_coverage)

toolkit/xre/moz.build

@@ -223,6 +223,3 @@ if CONFIG['GNU_CXX']:
 
 if CONFIG['MOZ_IPDL_TESTS']:
     DEFINES['MOZ_IPDL_TESTS'] = True
-
-if CONFIG['MOZ_CODE_COVERAGE']:
-    DEFINES['MOZ_CODE_COVERAGE'] = True

xpcom/tests/gtest/moz.build

@@ -69,9 +69,6 @@ if CONFIG['WRAP_STL_INCLUDES'] and not CONFIG['CLANG_CL']:
         'TestSTLWrappers.cpp',
     ]
 
-if CONFIG['MOZ_CODE_COVERAGE']:
-    DEFINES['MOZ_CODE_COVERAGE'] = True
-
 # Compile TestAllocReplacement separately so Windows headers don't pollute
 # the global namespace for other files.
 SOURCES += [