From 6bc9a4f376b17169116d785f962f779f09b7b621 Mon Sep 17 00:00:00 2001
From: Gregory Szorc <gps@mozilla.com>
Date: Wed, 30 Sep 2015 09:46:35 -0700
Subject: [PATCH] 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 | 12 ++++++++++++
 testing/mochitest/Makefile.in                   |  1 -
 testing/testsuite-targets.mk                    |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/python/mozbuild/mozbuild/action/test_archive.py b/python/mozbuild/mozbuild/action/test_archive.py
index 0ac55d69a1b..f29ad61d104 100644
--- a/python/mozbuild/mozbuild/action/test_archive.py
+++ b/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,
diff --git a/testing/mochitest/Makefile.in b/testing/mochitest/Makefile.in
index 3157c82b6e0..9aca54fc7e9 100644
--- a/testing/mochitest/Makefile.in
+++ b/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 -)
diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk
index 087db87ef89..b704ac8b80f 100644
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -396,13 +396,13 @@ endif
 
 TEST_PKGS := \
   cppunittest \
-  mochitest \
   reftest \
   talos \
   web-platform \
   $(NULL)
 
 PYTHON_TEST_PKGS := \
+  mochitest \
   xpcshell \
   $(NULL)