Backed out changeset 4530cf55b7b4 (bug 1497339) for reftest failures No such file or directory ../specialpowers CLOSED TREE
authorCiure Andrei <aciure@mozilla.com>
Thu, 11 Oct 2018 01:07:22 +0300
changeset 496362 c1b6778df32c18475f06b4433e5ba13cdbc3ce89
parent 496361 0bd0dc3c8183e67a37fd08617a5b456049bf444b
child 496363 c8ac5fc2e323999eefcb33ee1bb39db27ed3f0a2
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1497339
milestone64.0a1
backs out4530cf55b7b4d86e41080dae86a2ec85f0b29edf
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
Backed out changeset 4530cf55b7b4 (bug 1497339) for reftest failures No such file or directory ../specialpowers CLOSED TREE
layout/tools/reftest/Makefile.in
layout/tools/reftest/reftestcommandline.py
python/mozbuild/mozbuild/action/test_archive.py
testing/specialpowers/Makefile.in
new file mode 100644
--- /dev/null
+++ b/layout/tools/reftest/Makefile.in
@@ -0,0 +1,14 @@
+# 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.distdir,
-                                                    "xpi-stage", "reftest")
+                reftestExtensionPath = os.path.join(self.build_obj.topobjdir, "_tests",
+                                                    "reftest", "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.distdir,
-                                                          "xpi-stage", "specialpowers")
+                specialPowersExtensionPath = os.path.join(self.build_obj.topobjdir, "_tests",
+                                                          "reftest", "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,29 +404,17 @@ 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,6 +1,18 @@
 #
 # 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