mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-25 22:01:30 +00:00
Backed out 3 changesets (bug 917999) for Android x86 test bustage.
Backed out changeset 58331e57de1c (bug 917999) Backed out changeset 50f9123412c7 (bug 917999) Backed out changeset 3b19643ec039 (bug 917999) CLOSED TREE
This commit is contained in:
parent
b4b1e8538e
commit
a0a6937292
@ -17,15 +17,9 @@ ALL_HARNESSES = [
|
||||
'cppunittest',
|
||||
'jittest',
|
||||
'mozbase',
|
||||
'web-platform',
|
||||
]
|
||||
|
||||
PACKAGE_SPECIFIED_HARNESSES = [
|
||||
'cppunittest',
|
||||
'mochitest',
|
||||
'reftest',
|
||||
'xpcshell',
|
||||
'web-platform',
|
||||
]
|
||||
|
||||
|
||||
@ -37,9 +31,6 @@ def parse_args():
|
||||
parser.add_argument("--jsshell", required=True,
|
||||
action="store", dest="jsshell",
|
||||
help="Name of the jsshell zip.")
|
||||
parser.add_argument("--use-short-names", action="store_true",
|
||||
help="Use short names for packages (target.$name.tests.zip "
|
||||
"instead of $(PACKAGE_BASENAME).$name.tests.zip)")
|
||||
for harness in PACKAGE_SPECIFIED_HARNESSES:
|
||||
parser.add_argument("--%s" % harness, required=True,
|
||||
action="store", dest=harness,
|
||||
@ -57,18 +48,12 @@ def generate_package_data(args):
|
||||
# which will be an optimization once parts of the main zip are split to harness
|
||||
# specific zips.
|
||||
tests_common = args.tests_common
|
||||
if args.use_short_names:
|
||||
tests_common = 'target.common.tests.zip'
|
||||
|
||||
jsshell = args.jsshell
|
||||
|
||||
harness_requirements = dict([(k, [tests_common]) for k in ALL_HARNESSES])
|
||||
harness_requirements['jittest'].append(jsshell)
|
||||
for harness in PACKAGE_SPECIFIED_HARNESSES:
|
||||
pkg_name = getattr(args, harness)
|
||||
if args.use_short_names:
|
||||
pkg_name = 'target.%s.tests.zip' % harness
|
||||
harness_requirements[harness].append(pkg_name)
|
||||
harness_requirements[harness].append(getattr(args, harness))
|
||||
return harness_requirements
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
@ -99,7 +99,7 @@ config = {
|
||||
},
|
||||
"cppunittest": {
|
||||
"run_filename": "remotecppunittests.py",
|
||||
"testsdir": "cppunittest",
|
||||
"testsdir": "cppunittests",
|
||||
"options": [
|
||||
"--symbols-path=%(symbols_path)s",
|
||||
"--xre-path=%(xre_path)s",
|
||||
|
@ -15,7 +15,7 @@ config = {
|
||||
"--skip-manifest=../tests/cppunittests/android_cppunittest_manifest.txt"
|
||||
],
|
||||
"run_filename": "remotecppunittests.py",
|
||||
"testsdir": "cppunittest"
|
||||
"testsdir": "cppunittests"
|
||||
},
|
||||
"crashtest": {
|
||||
"options": [
|
||||
|
@ -16,7 +16,7 @@ config = {
|
||||
"."
|
||||
],
|
||||
"run_filename": "remotecppunittests.py",
|
||||
"testsdir": "cppunittest"
|
||||
"testsdir": "cppunittests"
|
||||
},
|
||||
"crashtest": {
|
||||
"options": [
|
||||
|
@ -10,7 +10,7 @@ config = {
|
||||
"--xre-path=%(abs_app_dir)s"
|
||||
],
|
||||
"run_filename": "runcppunittests.py",
|
||||
"testsdir": "cppunittest"
|
||||
"testsdir": "cppunittests"
|
||||
},
|
||||
"jittest": {
|
||||
"options": [
|
||||
|
@ -10,7 +10,7 @@ config = {
|
||||
"--xre-path=%(abs_app_dir)s"
|
||||
],
|
||||
"run_filename": "runcppunittests.py",
|
||||
"testsdir": "cppunittest"
|
||||
"testsdir": "cppunittests"
|
||||
},
|
||||
"jittest": {
|
||||
"options": [
|
||||
|
@ -10,7 +10,7 @@ config = {
|
||||
"--xre-path=%(abs_app_dir)s"
|
||||
],
|
||||
"run_filename": "runcppunittests.py",
|
||||
"testsdir": "cppunittest"
|
||||
"testsdir": "cppunittests"
|
||||
},
|
||||
"jittest": {
|
||||
"options": [
|
||||
|
@ -1,4 +1,4 @@
|
||||
{
|
||||
"repo": "https://hg.mozilla.org/build/mozharness",
|
||||
"revision": "94dbc2337e5f"
|
||||
"revision": "30d82783408b"
|
||||
}
|
||||
|
@ -87,7 +87,7 @@ task:
|
||||
# need to provide an easy way to lookup the correct aritfact path.
|
||||
locations:
|
||||
build: 'public/name_i_made_up.tar.gz'
|
||||
tests: 'public/some_tests.zip' or test_packages: 'public/test_packages.json'
|
||||
tests: 'public/some_tests.zip'
|
||||
```
|
||||
|
||||
#### Templates properties
|
||||
|
@ -280,19 +280,10 @@ class Graph(object):
|
||||
taskcluster_graph.build_task.validate(build_task)
|
||||
graph['tasks'].append(build_task)
|
||||
|
||||
test_packages_url, tests_url = None, None
|
||||
|
||||
if 'test_packages' in build_task['task']['extra']['locations']:
|
||||
test_packages_url = ARTIFACT_URL.format(
|
||||
build_parameters['build_slugid'],
|
||||
build_task['task']['extra']['locations']['test_packages']
|
||||
)
|
||||
|
||||
if 'tests' in build_task['task']['extra']['locations']:
|
||||
tests_url = ARTIFACT_URL.format(
|
||||
build_parameters['build_slugid'],
|
||||
build_task['task']['extra']['locations']['tests']
|
||||
)
|
||||
tests_url = ARTIFACT_URL.format(
|
||||
build_parameters['build_slugid'],
|
||||
build_task['task']['extra']['locations']['tests']
|
||||
)
|
||||
|
||||
build_url = ARTIFACT_URL.format(
|
||||
build_parameters['build_slugid'],
|
||||
@ -336,10 +327,7 @@ class Graph(object):
|
||||
test_parameters = copy.copy(build_parameters)
|
||||
test_parameters['build_url'] = build_url
|
||||
test_parameters['img_url'] = img_url
|
||||
if tests_url:
|
||||
test_parameters['tests_url'] = tests_url
|
||||
if test_packages_url:
|
||||
test_parameters['test_packages_url'] = test_packages_url
|
||||
test_parameters['tests_url'] = tests_url
|
||||
|
||||
test_definition = templates.load(test['task'], {})['task']
|
||||
chunk_config = test_definition['extra']['chunks']
|
||||
|
@ -27,7 +27,7 @@ cd $MOZ_OBJDIR/dist
|
||||
ls -lah $MOZ_OBJDIR/dist/
|
||||
|
||||
# Target names are cached so make sure we discard them first if found.
|
||||
rm -f target.linux-x86_64.tar.bz2 target.linux-x86_64.json target*.tests.zip
|
||||
rm -f target.linux-x86_64.tar.bz2 target.linux-x86_64.json target.tests.zip
|
||||
|
||||
# Artifacts folder is outside of the cache.
|
||||
mkdir -p $HOME/artifacts/
|
||||
@ -36,10 +36,7 @@ mkdir -p $HOME/artifacts/
|
||||
# the right filename in the task payload where artifacts are declared
|
||||
mv *.linux-x86_64.tar.bz2 $HOME/artifacts/target.linux-x86_64.tar.bz2
|
||||
mv *.linux-x86_64.json $HOME/artifacts/target.linux-x86_64.json
|
||||
for name in common cppunittest reftest mochitest xpcshell; do
|
||||
mv *.$name.tests.zip $HOME/artifacts/target.$name.tests.zip ;
|
||||
done
|
||||
mv test_packages_tc.json $HOME/artifacts/test_packages.json
|
||||
mv *.tests.zip $HOME/artifacts/target.tests.zip
|
||||
mv *.crashreporter-symbols.zip $HOME/artifacts/target.crashreporter-symbols.zip
|
||||
|
||||
# If the simulator does not exist don't fail
|
||||
|
@ -58,7 +58,7 @@ ls -lah $WORKSPACE/B2G/objdir-gecko/dist/
|
||||
|
||||
mv $WORKSPACE/B2G/sources.xml $HOME/artifacts/sources.xml
|
||||
mv $WORKSPACE/B2G/out/target/product/generic_x86/tests/gaia-tests.zip $HOME/artifacts/gaia-tests.zip
|
||||
mv $WORKSPACE/B2G/out/target/product/generic_x86/tests/b2g-*.zip $HOME/artifacts
|
||||
mv $WORKSPACE/B2G/out/target/product/generic_x86/tests/b2g-*tests.zip $HOME/artifacts/b2g-tests.zip
|
||||
mv $WORKSPACE/B2G/out/emulator.tar.gz $HOME/artifacts/emulator.tar.gz
|
||||
mv $WORKSPACE/B2G/objdir-gecko/dist/b2g-*.crashreporter-symbols.zip $HOME/artifacts/b2g-crashreporter-symbols.zip
|
||||
|
||||
|
@ -64,7 +64,7 @@ ls -lah $WORKSPACE/B2G/objdir-gecko/dist/
|
||||
|
||||
mv $WORKSPACE/B2G/sources.xml $HOME/artifacts/sources.xml
|
||||
mv $WORKSPACE/B2G/out/target/product/generic/tests/gaia-tests.zip $HOME/artifacts/gaia-tests.zip
|
||||
mv $WORKSPACE/B2G/out/target/product/generic/tests/b2g-*.zip $HOME/artifacts
|
||||
mv $WORKSPACE/B2G/out/target/product/generic/tests/b2g-*tests.zip $HOME/artifacts/b2g-tests.zip
|
||||
mv $WORKSPACE/B2G/out/emulator.tar.gz $HOME/artifacts/emulator.tar.gz
|
||||
mv $WORKSPACE/B2G/objdir-gecko/dist/b2g-*.crashreporter-symbols.zip $HOME/artifacts/b2g-crashreporter-symbols.zip
|
||||
|
||||
|
@ -21,7 +21,7 @@ cd $MOZ_OBJDIR/dist;
|
||||
ls -lah $MOZ_OBJDIR/dist/
|
||||
|
||||
# Target names are cached so make sure we discard them first if found.
|
||||
rm -f target.linux-x86_64.tar.bz2 target.linux-x86_64.json target*.tests.zip
|
||||
rm -f target.linux-x86_64.tar.bz2 target.linux-x86_64.json target.tests.zip
|
||||
|
||||
# Artifacts folder is outside of the cache.
|
||||
mkdir -p $HOME/artifacts/
|
||||
@ -30,10 +30,7 @@ mkdir -p $HOME/artifacts/
|
||||
# the right filename in the task payload where artifacts are declared
|
||||
mv *.linux-x86_64.tar.bz2 $HOME/artifacts/target.linux-x86_64.tar.bz2
|
||||
mv *.linux-x86_64.json $HOME/artifacts/target.linux-x86_64.json
|
||||
for name in common cppunittest reftest mochitest xpcshell; do
|
||||
mv *.$name.tests.zip $HOME/artifacts/target.$name.tests.zip ;
|
||||
done
|
||||
mv test_packages_tc.json $HOME/artifacts/test_packages.json
|
||||
mv *.tests.zip $HOME/artifacts/target.tests.zip
|
||||
mv *.crashreporter-symbols.zip $HOME/artifacts/target.crashreporter-symbols.zip
|
||||
mv jsshell-linux-x86_64.zip $HOME/artifacts/jsshell-linux-x86_64.zip
|
||||
|
||||
|
@ -29,6 +29,5 @@ def validate(task):
|
||||
if 'build' not in locations:
|
||||
raise BuildTaskValidationException('task.extra.locations.build missing')
|
||||
|
||||
if 'tests' not in locations and 'test_packages' not in locations:
|
||||
raise BuildTaskValidationException('task.extra.locations.tests or '
|
||||
'task.extra.locations.tests_packages missing')
|
||||
if 'tests' not in locations:
|
||||
raise BuildTaskValidationException('task.extra.locations.tests missing')
|
||||
|
@ -35,4 +35,4 @@ task:
|
||||
# files are located.
|
||||
locations:
|
||||
build: 'public/build/target.linux-x86_64.tar.bz2'
|
||||
test_packages: 'public/build/test_packages.json'
|
||||
tests: 'public/build/target.tests.zip'
|
||||
|
@ -50,4 +50,4 @@ task:
|
||||
# files are located.
|
||||
locations:
|
||||
build: 'public/build/target.linux-x86_64.tar.bz2'
|
||||
test_packages: 'public/build/test_packages.json'
|
||||
tests: 'public/build/target.tests.zip'
|
||||
|
@ -18,7 +18,7 @@ task:
|
||||
--config-file ./mozharness_configs/remove_executables.py
|
||||
--installer-url {{build_url}}
|
||||
--no-pull
|
||||
--test-packages-url {{test_packages_url}}
|
||||
--test-url {{tests_url}}
|
||||
--download-symbols ondemand
|
||||
--gaia-repo https://hg.mozilla.org/integration/gaia-central
|
||||
--gaia-dir /home/worker
|
||||
|
@ -20,7 +20,7 @@ task:
|
||||
--no-pull
|
||||
--download-symbols ondemand
|
||||
--installer-url {{build_url}}
|
||||
--test-packages-url {{test_packages_url}}
|
||||
--test-url {{tests_url}}
|
||||
--gaia-repo https://hg.mozilla.org/integration/gaia-central
|
||||
--gaia-dir /home/worker
|
||||
artifacts:
|
||||
|
@ -19,7 +19,7 @@ task:
|
||||
--config-file ./mozharness_configs/remove_executables.py
|
||||
--no-pull
|
||||
--installer-url {{build_url}}
|
||||
--test-packages-url {{test_packages_url}}
|
||||
--test-url {{tests_url}}
|
||||
--download-symbols ondemand
|
||||
--total-chunk {{total_chunks}}
|
||||
--this-chunk {{chunk}}
|
||||
|
@ -19,7 +19,7 @@ task:
|
||||
--config-file ./mozharness_configs/remove_executables.py
|
||||
--no-pull
|
||||
--installer-url {{build_url}}
|
||||
--test-packages-url {{test_packages_url}}
|
||||
--test-url {{tests_url}}
|
||||
--download-symbols ondemand
|
||||
--gip-suite accessibility
|
||||
--gaia-repo https://hg.mozilla.org/integration/gaia-central
|
||||
|
@ -19,7 +19,7 @@ task:
|
||||
--config-file ./mozharness_configs/remove_executables.py
|
||||
--no-pull
|
||||
--installer-url {{build_url}}
|
||||
--test-packages-url {{test_packages_url}}
|
||||
--test-url {{tests_url}}
|
||||
--download-symbols ondemand
|
||||
--gip-suite functional
|
||||
--total-chunk {{total_chunks}}
|
||||
|
@ -19,7 +19,7 @@ task:
|
||||
--config-file ./mozharness_configs/remove_executables.py
|
||||
--installer-url {{build_url}}
|
||||
--no-pull
|
||||
--test-packages-url {{test_packages_url}}
|
||||
--test-url {{tests_url}}
|
||||
--download-symbols ondemand
|
||||
--gip-suite unit
|
||||
--gaia-repo https://hg.mozilla.org/integration/gaia-central
|
||||
|
@ -20,7 +20,7 @@ task:
|
||||
--download-symbols ondemand
|
||||
--no-pull
|
||||
--installer-url {{build_url}}
|
||||
--test-packages-url {{test_packages_url}}
|
||||
--test-url {{tests_url}}
|
||||
--gaia-repo https://hg.mozilla.org/integration/gaia-central
|
||||
--gaia-dir /home/worker
|
||||
--xre-url https://queue.taskcluster.net/v1/task/wXAHAaxDQpqxoWF1iljJjg/runs/0/artifacts/public/cache/xulrunner-sdk-40.zip
|
||||
|
@ -20,7 +20,7 @@ task:
|
||||
--no-pull
|
||||
--app-arg -oop
|
||||
--installer-url {{build_url}}
|
||||
--test-packages-url {{test_packages_url}}
|
||||
--test-url {{tests_url}}
|
||||
--download-symbols ondemand
|
||||
--gaia-repo https://hg.mozilla.org/integration/gaia-central
|
||||
--gaia-dir /home/worker
|
||||
|
@ -18,7 +18,7 @@ task:
|
||||
--download-symbols ondemand
|
||||
--no-pull
|
||||
--installer-url {{build_url}}
|
||||
--test-packages-url {{test_packages_url}}
|
||||
--test-url {{tests_url}}
|
||||
--gaia-repo https://hg.mozilla.org/integration/gaia-central
|
||||
--gaia-dir /home/worker
|
||||
artifacts:
|
||||
|
@ -14,7 +14,7 @@ task:
|
||||
--config-file ./mozharness/configs/unittests/linux_unittest.py
|
||||
--config-file ./mozharness_configs/remove_executables.py
|
||||
--installer-url {{build_url}}
|
||||
--test-packages-url {{test_packages_url}}
|
||||
--test-url {{tests_url}}
|
||||
--download-symbols ondemand
|
||||
--mochitest-suite plain-chunked
|
||||
--total-chunk={{total_chunks}}
|
||||
|
@ -19,7 +19,7 @@ task:
|
||||
--config-file ./mozharness_configs/remove_executables.py
|
||||
--no-pull
|
||||
--installer-url {{build_url}}
|
||||
--test-packages-url {{test_packages_url}}
|
||||
--test-url {{tests_url}}
|
||||
--download-symbols ondemand
|
||||
--test-suite reftest
|
||||
--test-manifest tests/layout/reftests/reftest.list
|
||||
|
@ -407,7 +407,6 @@ package-tests: \
|
||||
stage-web-platform-tests \
|
||||
stage-luciddream \
|
||||
test-packages-manifest \
|
||||
test-packages-manifest-tc \
|
||||
$(NULL)
|
||||
ifdef MOZ_WEBRTC
|
||||
package-tests: stage-steeplechase
|
||||
@ -417,45 +416,19 @@ else
|
||||
PKG_STAGE = $(DIST)/universal/test-stage
|
||||
endif
|
||||
|
||||
TEST_PKGS := \
|
||||
cppunittest \
|
||||
mochitest \
|
||||
reftest \
|
||||
xpcshell \
|
||||
web-platform \
|
||||
$(NULL)
|
||||
|
||||
PKG_ARG = --$(1) $(PKG_BASENAME).$(1).tests.zip
|
||||
|
||||
test-packages-manifest-tc:
|
||||
$(PYTHON) $(topsrcdir)/build/gen_test_packages_manifest.py \
|
||||
--jsshell $(JSSHELL_NAME) \
|
||||
--dest-file $(MOZ_TEST_PACKAGES_FILE_TC) \
|
||||
--use-short-names \
|
||||
$(call PKG_ARG,common) \
|
||||
$(foreach pkg,$(TEST_PKGS),$(call PKG_ARG,$(pkg)))
|
||||
|
||||
test-packages-manifest:
|
||||
@rm -f $(MOZ_TEST_PACKAGES_FILE)
|
||||
$(PYTHON) $(topsrcdir)/build/gen_test_packages_manifest.py \
|
||||
--jsshell $(JSSHELL_NAME) \
|
||||
--dest-file $(MOZ_TEST_PACKAGES_FILE) \
|
||||
$(call PKG_ARG,common) \
|
||||
$(foreach pkg,$(TEST_PKGS),$(call PKG_ARG,$(pkg)))
|
||||
$(PYTHON) $(topsrcdir)/build/gen_test_packages_manifest.py --common $(TEST_PACKAGE) --jsshell $(JSSHELL_NAME) --dest-file $(MOZ_TEST_PACKAGES_FILE)
|
||||
|
||||
package-tests:
|
||||
@rm -f '$(DIST)/$(PKG_PATH)$(TEST_PACKAGE)'
|
||||
ifndef UNIVERSAL_BINARY
|
||||
$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
|
||||
endif
|
||||
# Exclude harness specific directories when generating the common zip.
|
||||
$(MKDIR) -p $(abspath $(DIST))/$(PKG_PATH) && \
|
||||
cd $(PKG_STAGE) && \
|
||||
zip -rq9D '$(abspath $(DIST))/$(PKG_PATH)$(TEST_PACKAGE)' \
|
||||
* -x \*/.mkdir.done \*.pyc $(foreach name,$(TEST_PKGS),$(name)\*) && \
|
||||
$(foreach name,$(TEST_PKGS),rm -f '$(DIST)/$(PKG_PATH)$(PKG_BASENAME).'$(name)'.tests.zip' && \
|
||||
zip -rq9D '$(abspath $(DIST))/$(PKG_PATH)$(PKG_BASENAME).'$(name)'.tests.zip' \
|
||||
$(name) -x \*/.mkdir.done \*.pyc ;)
|
||||
* -x \*/.mkdir.done \*.pyc
|
||||
|
||||
ifeq ($(MOZ_WIDGET_TOOLKIT),android)
|
||||
package-tests: stage-android
|
||||
@ -537,24 +510,24 @@ endif
|
||||
endif
|
||||
|
||||
stage-cppunittests: make-stage-dir
|
||||
$(NSINSTALL) -D $(PKG_STAGE)/cppunittest
|
||||
$(NSINSTALL) -D $(PKG_STAGE)/cppunittests
|
||||
ifdef STRIP_CPP_TESTS
|
||||
$(foreach bin,$(CPP_UNIT_TEST_BINS),$(OBJCOPY) $(or $(STRIP_FLAGS),--strip-unneeded) $(bin) $(bin:$(DIST)/cppunittests/%=$(PKG_STAGE)/cppunittest/%);)
|
||||
$(foreach bin,$(CPP_UNIT_TEST_BINS),$(OBJCOPY) $(or $(STRIP_FLAGS),--strip-unneeded) $(bin) $(bin:$(DIST)/%=$(PKG_STAGE)/%);)
|
||||
else
|
||||
cp -RL $(CPP_UNIT_TEST_BINS) $(PKG_STAGE)/cppunittest
|
||||
cp -RL $(DIST)/cppunittests $(PKG_STAGE)
|
||||
endif
|
||||
cp $(topsrcdir)/testing/runcppunittests.py $(PKG_STAGE)/cppunittest
|
||||
cp $(topsrcdir)/testing/remotecppunittests.py $(PKG_STAGE)/cppunittest
|
||||
cp $(topsrcdir)/testing/cppunittest.ini $(PKG_STAGE)/cppunittest
|
||||
cp $(DEPTH)/mozinfo.json $(PKG_STAGE)/cppunittest
|
||||
cp $(topsrcdir)/testing/runcppunittests.py $(PKG_STAGE)/cppunittests
|
||||
cp $(topsrcdir)/testing/remotecppunittests.py $(PKG_STAGE)/cppunittests
|
||||
cp $(topsrcdir)/testing/cppunittest.ini $(PKG_STAGE)/cppunittests
|
||||
cp $(DEPTH)/mozinfo.json $(PKG_STAGE)/cppunittests
|
||||
ifeq ($(MOZ_DISABLE_STARTUPCACHE),)
|
||||
cp $(topsrcdir)/startupcache/test/TestStartupCacheTelemetry.js $(PKG_STAGE)/cppunittest
|
||||
cp $(topsrcdir)/startupcache/test/TestStartupCacheTelemetry.manifest $(PKG_STAGE)/cppunittest
|
||||
cp $(topsrcdir)/startupcache/test/TestStartupCacheTelemetry.js $(PKG_STAGE)/cppunittests
|
||||
cp $(topsrcdir)/startupcache/test/TestStartupCacheTelemetry.manifest $(PKG_STAGE)/cppunittests
|
||||
endif
|
||||
ifdef STRIP_CPP_TESTS
|
||||
$(OBJCOPY) $(or $(STRIP_FLAGS),--strip-unneeded) $(DIST)/bin/jsapi-tests$(BIN_SUFFIX) $(PKG_STAGE)/cppunittest/jsapi-tests$(BIN_SUFFIX)
|
||||
$(OBJCOPY) $(or $(STRIP_FLAGS),--strip-unneeded) $(DIST)/bin/jsapi-tests$(BIN_SUFFIX) $(PKG_STAGE)/cppunittests/jsapi-tests$(BIN_SUFFIX)
|
||||
else
|
||||
cp -RL $(DIST)/bin/jsapi-tests$(BIN_SUFFIX) $(PKG_STAGE)/cppunittest
|
||||
cp -RL $(DIST)/bin/jsapi-tests$(BIN_SUFFIX) $(PKG_STAGE)/cppunittests
|
||||
endif
|
||||
|
||||
stage-jittest: make-stage-dir
|
||||
@ -634,6 +607,5 @@ stage-instrumentation-tests: make-stage-dir
|
||||
stage-instrumentation-tests \
|
||||
stage-luciddream \
|
||||
test-packages-manifest \
|
||||
test-packages-manifest-tc \
|
||||
$(NULL)
|
||||
|
||||
|
@ -129,12 +129,7 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME).crashreporter-symbols
|
||||
CODE_COVERAGE_ARCHIVE_BASENAME = $(PKG_BASENAME).code-coverage-gcno
|
||||
|
||||
# Test package naming
|
||||
TEST_PACKAGE = $(PKG_BASENAME).common.tests.zip
|
||||
CPP_TEST_PACKAGE = $(PKG_BASENAME).cppunittest.tests.zip
|
||||
XPC_TEST_PACKAGE = $(PKG_BASENAME).xpcshell.tests.zip
|
||||
MOCHITEST_PACKAGE = $(PKG_BASENAME).mochitest.tests.zip
|
||||
REFTEST_PACKAGE = $(PKG_BASENAME).reftest.tests.zip
|
||||
WP_TEST_PACKAGE = $(PKG_BASENAME).web-platform.tests.zip
|
||||
TEST_PACKAGE = $(PKG_BASENAME).tests.zip
|
||||
|
||||
ifneq (,$(wildcard $(DIST)/bin/application.ini))
|
||||
BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID)
|
||||
@ -161,7 +156,6 @@ MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).txt
|
||||
MOZ_BUILDINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).json
|
||||
MOZ_MOZINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).mozinfo.json
|
||||
MOZ_TEST_PACKAGES_FILE = $(DIST)/$(PKG_PATH)/test_packages.json
|
||||
MOZ_TEST_PACKAGES_FILE_TC = $(DIST)/$(PKG_PATH)/test_packages_tc.json
|
||||
|
||||
# JavaScript Shell
|
||||
JSSHELL_NAME = jsshell-$(MOZ_PKG_PLATFORM).zip
|
||||
|
@ -726,11 +726,6 @@ UPLOAD_FILES= \
|
||||
$(call QUOTED_WILDCARD,$(DIST)/$(LANGPACK)) \
|
||||
$(call QUOTED_WILDCARD,$(wildcard $(DIST)/$(PARTIAL_MAR))) \
|
||||
$(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(TEST_PACKAGE)) \
|
||||
$(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(CPP_TEST_PACKAGE)) \
|
||||
$(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(XPC_TEST_PACKAGE)) \
|
||||
$(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(MOCHITEST_PACKAGE)) \
|
||||
$(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(REFTEST_PACKAGE)) \
|
||||
$(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(WP_TEST_PACKAGE)) \
|
||||
$(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip) \
|
||||
$(call QUOTED_WILDCARD,$(DIST)/$(SDK)) \
|
||||
$(call QUOTED_WILDCARD,$(MOZ_SOURCESTAMP_FILE)) \
|
||||
|
Loading…
Reference in New Issue
Block a user