Bug 1250961 - Move testing/xpcshell/Makefile.in to moz.build. r=gps

MozReview-Commit-ID: 8J9RzA0RZ0i
mozilla-spidermonkey · Feb 26, 2016 · b4517a0 · b4517a0
1 parent e547f4a
commit b4517a0
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 42 deletions.
diff --git a/python/mozbuild/mozbuild/action/test_archive.py b/python/mozbuild/mozbuild/action/test_archive.py
@@ -213,7 +213,11 @@
         {
             'source': buildconfig.topobjdir,
             'base': 'dist/bin/components',
-            'pattern': 'test_necko.xpt',
+            'patterns': [
+                'httpd.js',
+                'httpd.manifest',
+                'test_necko.xpt',
+            ],
             'dest': 'bin/components',
         },
         {
@@ -349,11 +353,39 @@
             'pattern': '**',
             'dest': 'xpcshell/tests',
         },
+        {
+            'source': buildconfig.topsrcdir,
+            'base': 'testing/xpcshell',
+            'patterns': [
+                'head.js',
+                'moz-http2/**',
+                'moz-spdy/**',
+                'node-http2/**',
+                'node-spdy/**',
+                'remotexpcshelltests.py',
+                'runtestsb2g.py',
+                'runxpcshelltests.py',
+                'xpcshellcommandline.py',
+            ],
+            'dest': 'xpcshell',
+        },
         {
             'source': STAGE,
             'base': '',
             'pattern': 'xpcshell/**',
         },
+        {
+            'source': buildconfig.topobjdir,
+            'base': '',
+            'pattern': 'mozinfo.json',
+            'dest': 'xpcshell',
+        },
+        {
+            'source': buildconfig.topobjdir,
+            'base': 'build',
+            'pattern': 'automation.py',
+            'dest': 'xpcshell',
+        },
     ],
 }
 

diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk
@@ -176,7 +176,6 @@ stage-all: \
   stage-mach \
   stage-extensions \
   stage-mochitest \
-  stage-xpcshell \
   stage-jstests \
   stage-jetpack \
   stage-marionette \
@@ -281,9 +280,6 @@ ifeq ($(MOZ_BUILD_APP),mobile/android)
 	$(NSINSTALL) $(DEPTH)/mobile/android/base/fennec_ids.txt $(PKG_STAGE)/mochitest
 endif
 
-stage-xpcshell: make-stage-dir
-	$(MAKE) -C $(DEPTH)/testing/xpcshell stage-package
-
 stage-jstests: make-stage-dir
 	$(MAKE) -C $(DEPTH)/js/src/tests stage-package
 
@@ -385,7 +381,6 @@ stage-extensions: make-stage-dir
   stage-b2g \
   stage-config \
   stage-mochitest \
-  stage-xpcshell \
   stage-jstests \
   stage-android \
   stage-jetpack \

diff --git a/testing/xpcshell/Makefile.in b/testing/xpcshell/Makefile.in
@@ -5,41 +5,5 @@
 
 include $(topsrcdir)/config/rules.mk
 
-# Harness files from the srcdir
-TEST_HARNESS_FILES := \
-  runxpcshelltests.py \
-  remotexpcshelltests.py \
-  runtestsb2g.py \
-  xpcshellcommandline.py \
-  head.js \
-  node-spdy \
-  moz-spdy \
-  node-http2 \
-  moz-http2 \
-  $(NULL)
-
-# Extra files needed from $(topsrcdir)/build
-EXTRA_BUILD_FILES := \
-  manifestparser.py \
-  $(NULL)
-
-# Components / typelibs that don't get packaged with
-# the build, but that we need for the test harness.
-TEST_HARNESS_COMPONENTS := \
-  httpd.js \
-  httpd.manifest \
-  $(NULL)
-
-# Rules for staging the necessary harness bits for a test package
-PKG_STAGE = $(DIST)/test-stage
-
 libs::
 	cp $(DEPTH)/_tests/xpcshell/xpcshell.ini $(DEPTH)/_tests/xpcshell/all-test-dirs.list
-
-stage-package:
-	$(NSINSTALL) -D $(PKG_STAGE)/xpcshell/tests
-	@(cd $(srcdir) && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_FILES)) | (cd $(PKG_STAGE)/xpcshell && tar -xf -)
-	@(cd $(topsrcdir)/build && tar $(TAR_CREATE_FLAGS) - $(EXTRA_BUILD_FILES)) | (cd $(PKG_STAGE)/xpcshell && tar -xf -)
-	@cp $(DEPTH)/mozinfo.json $(PKG_STAGE)/xpcshell
-	@cp $(DEPTH)/build/automation.py $(PKG_STAGE)/xpcshell
-	@(cd $(DIST)/bin/components && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_COMPONENTS)) | (cd $(PKG_STAGE)/bin/components && tar -xf -)