Bug 1497339 - Fix reftests in the Tup backend. r=ted,firefox-build-system-reviewers
☠☠ backed out by c1b6778df32c ☠ ☠
authorChris Manchester <cmanchester@mozilla.com>
Wed, 10 Oct 2018 20:28:04 +0000
changeset 488975 4530cf55b7b4d86e41080dae86a2ec85f0b29edf
parent 488974 01894c0196cb83376acc4bfce32f9d4a176d3b4e
child 488976 2852663b840e9a4348130dcbf8efdd494f738a76
push id246
push userfmarier@mozilla.com
push dateSat, 13 Oct 2018 00:15:40 +0000
reviewersted, firefox-build-system-reviewers
bugs1497339
milestone64.0a1
Bug 1497339 - Fix reftests in the Tup backend. r=ted,firefox-build-system-reviewers Differential Revision: https://phabricator.services.mozilla.com/D8284
layout/tools/reftest/Makefile.in
layout/tools/reftest/reftestcommandline.py
python/mozbuild/mozbuild/action/test_archive.py
testing/specialpowers/Makefile.in
deleted file mode 100644
--- a/layout/tools/reftest/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-# vim: set shiftwidth=8 tabstop=8 autoindent noexpandtab copyindent:
-# 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/reftest
-
-include $(topsrcdir)/config/rules.mk
-
-# copy harness and the reftest extension bits to $(_DEST_DIR)
-# This needs to happen after jar.mn handling from rules.mk included above.
-# The order of the :: rules ensures that.
-libs::
-	(cd $(DIST)/xpi-stage && tar $(TAR_CREATE_FLAGS) - reftest) | (cd $(_DEST_DIR) && tar -xf -)
--- a/layout/tools/reftest/reftestcommandline.py
+++ b/layout/tools/reftest/reftestcommandline.py
@@ -308,27 +308,27 @@ class ReftestArgumentsParser(argparse.Ar
                 self.error("--xre-path '%s' not found" % options.xrePath)
             if not os.path.isdir(options.xrePath):
                 self.error("--xre-path '%s' is not a directory" %
                            options.xrePath)
             options.xrePath = reftest.getFullPath(options.xrePath)
 
         if options.reftestExtensionPath is None:
             if self.build_obj is not None:
-                reftestExtensionPath = os.path.join(self.build_obj.topobjdir, "_tests",
-                                                    "reftest", "reftest")
+                reftestExtensionPath = os.path.join(self.build_obj.distdir,
+                                                    "xpi-stage", "reftest")
             else:
                 reftestExtensionPath = os.path.join(here, "reftest")
             options.reftestExtensionPath = os.path.normpath(reftestExtensionPath)
 
         if (options.specialPowersExtensionPath is None and
             options.suite in ["crashtest", "jstestbrowser"]):
             if self.build_obj is not None:
-                specialPowersExtensionPath = os.path.join(self.build_obj.topobjdir, "_tests",
-                                                          "reftest", "specialpowers")
+                specialPowersExtensionPath = os.path.join(self.build_obj.distdir,
+                                                          "xpi-stage", "specialpowers")
             else:
                 specialPowersExtensionPath = os.path.join(here, "specialpowers")
             options.specialPowersExtensionPath = os.path.normpath(specialPowersExtensionPath)
 
         options.leakThresholds = {
             "default": options.defaultLeakThreshold,
             "tab": options.defaultLeakThreshold,
         }
--- a/python/mozbuild/mozbuild/action/test_archive.py
+++ b/python/mozbuild/mozbuild/action/test_archive.py
@@ -404,17 +404,29 @@ ARCHIVE_FILES = {
         {
             'source': buildconfig.topsrcdir,
             'base': '',
             'manifests': [
                 'layout/reftests/reftest.list',
                 'testing/crashtest/crashtests.list',
             ],
             'dest': 'reftest/tests',
-        }
+        },
+        {
+            'source': buildconfig.topobjdir,
+            'base': 'dist/xpi-stage',
+            'pattern': 'reftest/**',
+            'dest': 'reftest'
+        },
+        {
+            'source': buildconfig.topobjdir,
+            'base': 'dist/xpi-stage',
+            'pattern': 'specialpowers/**',
+            'dest': 'specialpowers'
+        },
     ],
     'talos': [
         {
             'source': buildconfig.topsrcdir,
             'base': 'testing',
             'pattern': 'talos/**',
         },
         {
--- a/testing/specialpowers/Makefile.in
+++ b/testing/specialpowers/Makefile.in
@@ -1,18 +1,6 @@
 #
 # 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/.
 
-TEST_EXTENSIONS_DIR = $(DEPTH)/testing/specialpowers
 XPI_PKGNAME = specialpowers@mozilla.org
-
-include $(topsrcdir)/config/rules.mk
-
-libs-preqs = \
-  $(call mkdir_deps,$(TEST_EXTENSIONS_DIR)) \
-  $(NULL)
-
-libs:: $(libs-preqs)
-	(cd $(DIST)/xpi-stage && tar $(TAR_CREATE_FLAGS) - $(XPI_NAME)) | (cd $(TEST_EXTENSIONS_DIR) && tar -xf -)
-	$(NSINSTALL) -D $(DEPTH)/_tests/reftest/specialpowers
-	cp -RL $(DEPTH)/testing/specialpowers/specialpowers $(DEPTH)/_tests/reftest