Bug 1208320 - Produce mochitest test archive without staging test files; r=glandium

This is very similar to what we did for xpcshell. Like xpcshell, there
are still some staged files. However, about 73MB of copies are
eliminated with this change. On my machine, overall execution time of
test packaging appears to decrease, although CPU usage is up slightly.

python/mozbuild/mozbuild/action/test_archive.py

@@ -24,6 +24,18 @@ STAGE = mozpath.join(buildconfig.topobjdir, 'dist', 'test-stage')
 
 
 ARCHIVE_FILES = {
+    'mochitest': [
+        {
+            'source': buildconfig.topobjdir,
+            'base': '_tests/testing',
+            'pattern': 'mochitest/**',
+        },
+        {
+            'source': STAGE,
+            'base': '',
+            'pattern': 'mochitest/**',
+        },
+    ],
     'mozharness': [
         {
             'source': buildconfig.topsrcdir,

testing/mochitest/Makefile.in

@@ -112,7 +112,6 @@ endif
 stage-package:
 	$(NSINSTALL) -D $(PKG_STAGE)/mochitest && $(NSINSTALL) -D $(PKG_STAGE)/bin/plugins && $(NSINSTALL) -D $(DIST)/plugins
 	cp $(DEPTH)/mozinfo.json $(PKG_STAGE)/mochitest
-	(cd $(DEPTH)/_tests/testing && tar $(TAR_CREATE_FLAGS) - mochitest) | (cd $(PKG_STAGE) && tar -xf -)
 	@cp $(DEPTH)/mozinfo.json $(PKG_STAGE)/mochitest
 	@(cd $(DIST_BIN) && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_BINS)) | (cd $(PKG_STAGE)/bin && tar -xf -)
 	@(cd $(DIST_BIN)/components && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_COMPONENTS)) | (cd $(PKG_STAGE)/bin/components && tar -xf -)

testing/testsuite-targets.mk

@@ -396,13 +396,13 @@ endif
 
 TEST_PKGS := \
   cppunittest \
-  mochitest \
   reftest \
   talos \
   web-platform \
   $(NULL)
 
 PYTHON_TEST_PKGS := \
+  mochitest \
   xpcshell \
   $(NULL)