Bug 1208320 - Do not stage some reftest support files before archiving; r=glandium
authorGregory Szorc <gps@mozilla.com>
Wed, 30 Sep 2015 10:46:52 -0700
changeset 265422 6416acd3ff9b35b0960f5c9d91fe8e571f440e4f
parent 265421 a35d20fb25d97ab1594faf27510a1f8f26d0f4ec
child 265423 07a13667f8e0c4811170e24e1ee9f8d205ed0a7b
push id65931
push usergszorc@mozilla.com
push dateThu, 01 Oct 2015 05:36:32 +0000
treeherdermozilla-inbound@4a19c58da592 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1208320
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1208320 - Do not stage some reftest support files before archiving; r=glandium After this, only reftest files themselves are staged. Those will be addressed in a subsequent commit.
layout/tools/reftest/Makefile.in
python/mozbuild/mozbuild/action/test_archive.py
--- a/layout/tools/reftest/Makefile.in
+++ b/layout/tools/reftest/Makefile.in
@@ -49,16 +49,14 @@ libs:: $(_HARNESS_FILES) $(addprefix $(_
 	$(INSTALL) $(_HARNESS_FILES) $(_DEST_DIR)
 	(cd $(DIST)/xpi-stage && tar $(TAR_CREATE_FLAGS) - reftest) | (cd $(_DEST_DIR) && tar -xf -)
 
 PKG_STAGE = $(DIST)/test-stage
 
 # stage harness and tests for packaging
 stage-package:
 	$(NSINSTALL) -D $(PKG_STAGE)/reftest && $(NSINSTALL) -D $(PKG_STAGE)/reftest/tests
-	(cd $(DEPTH)/_tests/reftest/ && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/reftest && tar -xf -)
-	@cp $(DEPTH)/mozinfo.json $(PKG_STAGE)/reftest
 	$(PYTHON) $(topsrcdir)/layout/tools/reftest/print-manifest-dirs.py \
           $(topsrcdir) \
           $(topsrcdir)/layout/reftests/reftest.list \
           $(topsrcdir)/testing/crashtest/crashtests.list \
           | (cd $(topsrcdir) && xargs tar $(TAR_CREATE_FLAGS) -) \
           | (cd $(PKG_STAGE)/reftest/tests && tar -xf -)
--- a/python/mozbuild/mozbuild/action/test_archive.py
+++ b/python/mozbuild/mozbuild/action/test_archive.py
@@ -97,16 +97,27 @@ ARCHIVE_FILES = {
         },
     ],
     'reftest': [
         {
             'source': STAGE,
             'base': '',
             'pattern': 'reftest/**',
         },
+        {
+            'source': buildconfig.topobjdir,
+            'base': '_tests',
+            'pattern': 'reftest/**',
+        },
+        {
+            'source': buildconfig.topobjdir,
+            'base': '',
+            'pattern': 'mozinfo.json',
+            'dest': 'reftest',
+        },
     ],
     'talos': [
         {
             'source': buildconfig.topsrcdir,
             'base': 'testing',
             'pattern': 'talos/**',
         },
     ],