Bug 1250961 - Remove one-off rule to re-name master xpcshell manifest and update mozharness consumers. r=gps

MozReview-Commit-ID: B41G5burv9A
This commit is contained in:
Chris Manchester 2016-02-26 13:20:31 -08:00
parent 8b2d985312
commit 3cff6cd3e5
4 changed files with 6 additions and 15 deletions

View File

@ -274,13 +274,13 @@ config = {
"all_xpcshell_suites": { "all_xpcshell_suites": {
"xpcshell": { "xpcshell": {
"options": ["--xpcshell=%(abs_app_dir)s/" + XPCSHELL_NAME, "options": ["--xpcshell=%(abs_app_dir)s/" + XPCSHELL_NAME,
"--manifest=tests/xpcshell/tests/all-test-dirs.list"], "--manifest=tests/xpcshell/tests/xpcshell.ini"],
"tests": [] "tests": []
}, },
"xpcshell-addons": { "xpcshell-addons": {
"options": ["--xpcshell=%(abs_app_dir)s/" + XPCSHELL_NAME, "options": ["--xpcshell=%(abs_app_dir)s/" + XPCSHELL_NAME,
"--tag=addons", "--tag=addons",
"--manifest=tests/xpcshell/tests/all-test-dirs.list"], "--manifest=tests/xpcshell/tests/xpcshell.ini"],
"tests": [] "tests": []
}, },
}, },

View File

@ -209,13 +209,13 @@ config = {
"all_xpcshell_suites": { "all_xpcshell_suites": {
"xpcshell": { "xpcshell": {
'options': ["--xpcshell=%(abs_app_dir)s/" + XPCSHELL_NAME, 'options': ["--xpcshell=%(abs_app_dir)s/" + XPCSHELL_NAME,
"--manifest=tests/xpcshell/tests/all-test-dirs.list"], "--manifest=tests/xpcshell/tests/xpcshell.ini"],
'tests': [] 'tests': []
}, },
"xpcshell-addons": { "xpcshell-addons": {
'options': ["--xpcshell=%(abs_app_dir)s/" + XPCSHELL_NAME, 'options': ["--xpcshell=%(abs_app_dir)s/" + XPCSHELL_NAME,
"--tag=addons", "--tag=addons",
"--manifest=tests/xpcshell/tests/all-test-dirs.list"], "--manifest=tests/xpcshell/tests/xpcshell.ini"],
'tests': [] 'tests': []
}, },
}, },

View File

@ -232,13 +232,13 @@ config = {
"all_xpcshell_suites": { "all_xpcshell_suites": {
"xpcshell": { "xpcshell": {
'options': ["--xpcshell=%(abs_app_dir)s/" + XPCSHELL_NAME, 'options': ["--xpcshell=%(abs_app_dir)s/" + XPCSHELL_NAME,
"--manifest=tests/xpcshell/tests/all-test-dirs.list"], "--manifest=tests/xpcshell/tests/xpcshell.ini"],
'tests': [] 'tests': []
}, },
"xpcshell-addons": { "xpcshell-addons": {
'options': ["--xpcshell=%(abs_app_dir)s/" + XPCSHELL_NAME, 'options': ["--xpcshell=%(abs_app_dir)s/" + XPCSHELL_NAME,
"--tag=addons", "--tag=addons",
"--manifest=tests/xpcshell/tests/all-test-dirs.list"], "--manifest=tests/xpcshell/tests/xpcshell.ini"],
'tests': [] 'tests': []
}, },
}, },

View File

@ -1,9 +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/.
include $(topsrcdir)/config/rules.mk
libs::
cp $(DEPTH)/_tests/xpcshell/xpcshell.ini $(DEPTH)/_tests/xpcshell/all-test-dirs.list