Bug 992983 - Build and upload the gtest libxul during test packaging. r=ted

--HG--
extra : commitid : EH7XMBkAkta

Author: chmanchester

build/gen_test_packages_manifest.py

@@ -19,6 +19,7 @@
     'mozbase',
     'web-platform',
     'talos',
+    'gtest',
 ]
 
 PACKAGE_SPECIFIED_HARNESSES = [
@@ -30,6 +31,11 @@
     'talos',
 ]
 
+# These packages are not present for every build configuration.
+OPTIONAL_PACKAGES = [
+    'gtest',
+]
+
 
 def parse_args():
     parser = ArgumentParser(description='Generate a test_packages.json file to tell automation which harnesses require which test packages.')
@@ -46,6 +52,10 @@ def parse_args():
         parser.add_argument("--%s" % harness, required=True,
                             action="store", dest=harness,
                             help="Name of the %s zip." % harness)
+    for harness in OPTIONAL_PACKAGES:
+        parser.add_argument("--%s" % harness, required=False,
+                            action="store", dest=harness,
+                            help="Name of the %s zip." % harness)
     parser.add_argument("--dest-file", required=True,
                         action="store", dest="destfile",
                         help="Path to the output file to be written.")
@@ -66,8 +76,10 @@ def generate_package_data(args):
 
     harness_requirements = dict([(k, [tests_common]) for k in ALL_HARNESSES])
     harness_requirements['jittest'].append(jsshell)
-    for harness in PACKAGE_SPECIFIED_HARNESSES:
-        pkg_name = getattr(args, harness)
+    for harness in PACKAGE_SPECIFIED_HARNESSES + OPTIONAL_PACKAGES:
+        pkg_name = getattr(args, harness, None)
+        if pkg_name is None:
+            continue
         if args.use_short_names:
             pkg_name = 'target.%s.tests.zip' % harness
         harness_requirements[harness].append(pkg_name)

python/mozbuild/mozbuild/action/test_archive.py

@@ -34,6 +34,7 @@
             'pattern': '**',
             'ignore': [
                 'cppunittest/**',
+                'gtest/**',
                 'mochitest/**',
                 'reftest/**',
                 'talos/**',
@@ -153,6 +154,13 @@
             'dest': 'cppunittest',
         },
     ],
+    'gtest': [
+        {
+            'source': STAGE,
+            'base': '',
+            'pattern': 'gtest/**',
+        },
+    ],
     'mochitest': [
         {
             'source': buildconfig.topobjdir,

testing/gtest/Makefile.in

@@ -7,39 +7,12 @@
 
 include $(topsrcdir)/config/rules.mk
 
-# Bug 1028035: Linking xul-gtest.dll takes too long, so we disable GTest on
-# Windows PGO builds.
-ifeq (1_WINNT,$(MOZ_PGO)_$(OS_ARCH))
-SKIP_GTEST_DURING_MAKE_CHECK ?= 1
-endif
-
 ifeq (browser,$(MOZ_BUILD_APP))
 ifdef COMPILE_ENVIRONMENT
 gtest::
 	$(MAKE) -C $(DEPTH)/toolkit/library gtestxul
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 	$(MAKE) -C $(DEPTH)/browser/app repackage
 endif
-ifneq (1,$(SKIP_GTEST_DURING_MAKE_CHECK))
-check::
-	$(MAKE) -C $(DEPTH)/toolkit/library gtestxul
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-	$(MAKE) -C $(DEPTH)/browser/app repackage
-	$(PYTHON) $(topsrcdir)/testing/gtest/rungtests.py \
-		--cwd=$(DEPTH)/_tests/gtest \
-		--xre-path=$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources \
-		--symbols-path=$(DIST)/crashreporter-symbols \
-		$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/$(MOZ_APP_NAME)$(BIN_SUFFIX)
-else
-	$(PYTHON) $(topsrcdir)/testing/gtest/rungtests.py \
-		--cwd=$(DEPTH)/_tests/gtest \
-		--xre-path=$(DIST)/bin \
-		--symbols-path=$(DIST)/crashreporter-symbols \
-		$(DIST)/bin/$(MOZ_APP_NAME)$(BIN_SUFFIX)
-endif
-else
-check::
-	echo GTest skipped during make check
-endif
 endif
 endif

testing/testsuite-targets.mk

@@ -24,6 +24,20 @@ ifndef TEST_PACKAGE_NAME
 TEST_PACKAGE_NAME := $(ANDROID_PACKAGE_NAME)
 endif
 
+# Linking xul-gtest.dll takes too long, so we disable GTest on
+# Windows PGO builds (bug 1028035).
+ifneq (1_WINNT,$(MOZ_PGO)_$(OS_ARCH))
+BUILD_GTEST=1
+endif
+
+ifdef MOZ_B2G
+BUILD_GTEST=
+endif
+
+ifeq ($(MOZ_BUILD_APP),mobile/android)
+BUILD_GTEST=
+endif
+
 RUN_MOCHITEST_B2G_DESKTOP = \
   rm -f ./$@.log && \
   $(PYTHON) _tests/testing/mochitest/runtestsb2g.py \
@@ -399,6 +413,11 @@ TEST_PKGS := \
   xpcshell \
   $(NULL)
 
+ifdef BUILD_GTEST
+stage-all: stage-gtest
+TEST_PKGS += gtest
+endif
+
 PKG_ARG = --$(1) '$(PKG_BASENAME).$(1).tests.zip'
 
 test-packages-manifest-tc:
@@ -482,6 +501,15 @@ stage-xpcshell: make-stage-dir
 stage-jstests: make-stage-dir
 	$(MAKE) -C $(DEPTH)/js/src/tests stage-package
 
+stage-gtest: make-stage-dir
+# FIXME: (bug 1200311) We should be generating the gtest xul as part of the build.
+	$(MAKE) -C $(DEPTH)/testing/gtest gtest
+	$(NSINSTALL) -D $(PKG_STAGE)/gtest/gtest_bin
+	cp -RL $(DIST)/bin/gtest $(PKG_STAGE)/gtest/gtest_bin
+	cp -RL $(DEPTH)/_tests/gtest $(PKG_STAGE)
+	cp $(topsrcdir)/testing/gtest/rungtests.py $(PKG_STAGE)/gtest
+	cp $(DIST)/bin/dependentlibs.list.gtest $(PKG_STAGE)/gtest
+
 stage-android: make-stage-dir
 ifdef MOZ_ENABLE_SZIP
 # Tinderbox scripts are not unzipping everything, so the file needs to be in a directory it unzips

toolkit/mozapps/installer/package-name.mk

@@ -143,6 +143,7 @@ MOCHITEST_PACKAGE = $(PKG_BASENAME).mochitest.tests.zip
 REFTEST_PACKAGE = $(PKG_BASENAME).reftest.tests.zip
 WP_TEST_PACKAGE = $(PKG_BASENAME).web-platform.tests.zip
 TALOS_PACKAGE = $(PKG_BASENAME).talos.tests.zip
+GTEST_PACKAGE = $(PKG_BASENAME).gtest.tests.zip
 
 ifneq (,$(wildcard $(DIST)/bin/application.ini))
 BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID)

toolkit/mozapps/installer/upload-files.mk

@@ -743,6 +743,7 @@ UPLOAD_FILES= \
   $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(TALOS_PACKAGE)) \
   $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(REFTEST_PACKAGE)) \
   $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(WP_TEST_PACKAGE)) \
+  $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(GTEST_PACKAGE)) \
   $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip) \
   $(call QUOTED_WILDCARD,$(DIST)/$(SDK)) \
   $(call QUOTED_WILDCARD,$(MOZ_SOURCESTAMP_FILE)) \