Bug 1462489 - Put packaged test addons in the test package with the test packager rather than Makefile.in r=mshal

MozReview-Commit-ID: 56Ah9HQc9TT

--HG--
extra : rebase_source : cc74b4e385cc98036d24e120732cf4c30e73f962

python/mozbuild/mozbuild/action/test_archive.py

@@ -362,7 +362,19 @@ ARCHIVE_FILES = {
             'base': '',
             'pattern': 'mozinfo.json',
             'dest': 'mochitest'
-        }
+        },
+        {
+            'source': buildconfig.topobjdir,
+            'base': 'dist/xpi-stage',
+            'pattern': 'mochijar/**',
+            'dest': 'mochitest'
+        },
+        {
+            'source': buildconfig.topobjdir,
+            'base': 'dist/xpi-stage',
+            'pattern': 'specialpowers/**',
+            'dest': 'mochitest/extensions'
+        },
     ],
     'mozharness': [
         {

testing/mochitest/Makefile.in

@@ -1,15 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-
-_DEST_DIR = $(DEPTH)/_tests/$(relativesrcdir)
-
-include $(topsrcdir)/config/rules.mk
-
-libs:: 
-	(cd $(DIST)/xpi-stage && tar $(TAR_CREATE_FLAGS) - mochijar) | (cd $(_DEST_DIR) && tar -xf -)
-
-$(_DEST_DIR):
-	$(NSINSTALL) -D $@

testing/specialpowers/Makefile.in

@@ -14,7 +14,5 @@ libs-preqs = \
 
 libs:: $(libs-preqs)
 	(cd $(DIST)/xpi-stage && tar $(TAR_CREATE_FLAGS) - $(XPI_NAME)) | (cd $(TEST_EXTENSIONS_DIR) && tar -xf -)
-	$(NSINSTALL) -D $(DEPTH)/_tests/testing/mochitest/extensions/specialpowers
-	cp -RL $(DEPTH)/testing/specialpowers/specialpowers $(DEPTH)/_tests/testing/mochitest/extensions
 	$(NSINSTALL) -D $(DEPTH)/_tests/reftest/specialpowers
 	cp -RL $(DEPTH)/testing/specialpowers/specialpowers $(DEPTH)/_tests/reftest