Bug 1497339 - Fix reftests in the Tup backend. r=ted,firefox-build-system-reviewers
authorChris Manchester <cmanchester@mozilla.com>
Wed, 10 Oct 2018 23:12:32 +0000
changeset 499081 f9118ebe1bf160af3b6ddf2ffee8cdbd5b3ab5dc
parent 499080 f04a49448cf522e4157ef2468923224b79fcdb87
child 499082 e702628b7c514789f8372ac593da4ea9b445b7e2
push id1864
push userffxbld-merge
push dateMon, 03 Dec 2018 15:51:40 +0000
treeherdermozilla-release@f040763d99ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted, firefox-build-system-reviewers
bugs1497339
milestone64.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 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': 'reftest'
+        },
     ],
     '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