Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 23:31:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1497339 - Fix reftests in the Tup backend. r=ted,firefox-build-system-reviewers

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D8284

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Chris Manchester 2018-10-10 23:12:32 +00:00
parent c97a0087e4
commit 8632e09b6b
4 changed files with 17 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
layout/tools/reftest/Makefile.in
View File

@ -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 -)

8
layout/tools/reftest/reftestcommandline.py
View File

@ -313,8 +313,8 @@ class ReftestArgumentsParser(argparse.ArgumentParser):
if options.reftestExtensionPath is None: if options.reftestExtensionPath is None:
if self.build_obj is not None: if self.build_obj is not None:
reftestExtensionPath = os.path.join(self.build_obj.topobjdir, "_tests", reftestExtensionPath = os.path.join(self.build_obj.distdir,
"reftest", "reftest") "xpi-stage", "reftest")
else: else:
reftestExtensionPath = os.path.join(here, "reftest") reftestExtensionPath = os.path.join(here, "reftest")
options.reftestExtensionPath = os.path.normpath(reftestExtensionPath) options.reftestExtensionPath = os.path.normpath(reftestExtensionPath)
@ -322,8 +322,8 @@ class ReftestArgumentsParser(argparse.ArgumentParser):
if (options.specialPowersExtensionPath is None and if (options.specialPowersExtensionPath is None and
options.suite in ["crashtest", "jstestbrowser"]): options.suite in ["crashtest", "jstestbrowser"]):
if self.build_obj is not None: if self.build_obj is not None:
specialPowersExtensionPath = os.path.join(self.build_obj.topobjdir, "_tests", specialPowersExtensionPath = os.path.join(self.build_obj.distdir,
"reftest", "specialpowers") "xpi-stage", "specialpowers")
else: else:
specialPowersExtensionPath = os.path.join(here, "specialpowers") specialPowersExtensionPath = os.path.join(here, "specialpowers")
options.specialPowersExtensionPath = os.path.normpath(specialPowersExtensionPath) options.specialPowersExtensionPath = os.path.normpath(specialPowersExtensionPath)

14
python/mozbuild/mozbuild/action/test_archive.py
View File

@ -409,7 +409,19 @@ ARCHIVE_FILES = {
'testing/crashtest/crashtests.list', 'testing/crashtest/crashtests.list',
], ],
'dest': 'reftest/tests', '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': [ 'talos': [
{ {

12
testing/specialpowers/Makefile.in
View File

@ -3,16 +3,4 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # 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/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
TEST_EXTENSIONS_DIR = $(DEPTH)/testing/specialpowers
XPI_PKGNAME = specialpowers@mozilla.org 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