mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-16 23:05:42 +00:00
Bug 1462489 - Put packaged test addons in the test package with the test packager rather than Makefile.in r=mshal
MozReview-Commit-ID: 56Ah9HQc9TT --HG-- extra : rebase_source : d1af6d7c92aece08932e93e7a1f1b43a78292410
This commit is contained in:
parent
4690df6ce9
commit
508b393aa6
@ -362,7 +362,19 @@ ARCHIVE_FILES = {
|
||||
'base': '',
|
||||
'pattern': 'mozinfo.json',
|
||||
'dest': 'mochitest'
|
||||
}
|
||||
},
|
||||
{
|
||||
'source': buildconfig.topobjdir,
|
||||
'base': 'dist/xpi-stage',
|
||||
'pattern': 'mochijar/**',
|
||||
'dest': 'mochitest'
|
||||
},
|
||||
{
|
||||
'source': buildconfig.topobjdir,
|
||||
'base': 'dist/xpi-stage',
|
||||
'pattern': 'specialpowers/**',
|
||||
'dest': 'mochitest/extensions'
|
||||
},
|
||||
],
|
||||
'mozharness': [
|
||||
{
|
||||
|
@ -1,15 +0,0 @@
|
||||
#
|
||||
# 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/$(relativesrcdir)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
libs::
|
||||
(cd $(DIST)/xpi-stage && tar $(TAR_CREATE_FLAGS) - mochijar) | (cd $(_DEST_DIR) && tar -xf -)
|
||||
|
||||
$(_DEST_DIR):
|
||||
$(NSINSTALL) -D $@
|
@ -14,7 +14,5 @@ libs-preqs = \
|
||||
|
||||
libs:: $(libs-preqs)
|
||||
(cd $(DIST)/xpi-stage && tar $(TAR_CREATE_FLAGS) - $(XPI_NAME)) | (cd $(TEST_EXTENSIONS_DIR) && tar -xf -)
|
||||
$(NSINSTALL) -D $(DEPTH)/_tests/testing/mochitest/extensions/specialpowers
|
||||
cp -RL $(DEPTH)/testing/specialpowers/specialpowers $(DEPTH)/_tests/testing/mochitest/extensions
|
||||
$(NSINSTALL) -D $(DEPTH)/_tests/reftest/specialpowers
|
||||
cp -RL $(DEPTH)/testing/specialpowers/specialpowers $(DEPTH)/_tests/reftest
|
||||
|
Loading…
Reference in New Issue
Block a user