Bug 787200 - Move the Talos code into mozilla-central: create the talos test .zip file. r=ted

This commit is contained in:
Julien Pagès 2015-08-27 10:51:32 +02:00
parent 9fb540a682
commit aa4b2090a4
4 changed files with 12 additions and 0 deletions

View File

@ -18,6 +18,7 @@ ALL_HARNESSES = [
'jittest',
'mozbase',
'web-platform',
'talos',
]
PACKAGE_SPECIFIED_HARNESSES = [
@ -26,6 +27,7 @@ PACKAGE_SPECIFIED_HARNESSES = [
'reftest',
'xpcshell',
'web-platform',
'talos',
]

View File

@ -375,6 +375,7 @@ package-tests: \
stage-config \
stage-mach \
stage-mochitest \
stage-talos \
stage-reftest \
stage-xpcshell \
stage-jstests \
@ -398,6 +399,7 @@ TEST_PKGS := \
cppunittest \
mochitest \
reftest \
talos \
xpcshell \
web-platform \
$(NULL)
@ -478,6 +480,11 @@ ifeq ($(MOZ_BUILD_APP),mobile/android)
$(NSINSTALL) $(DEPTH)/mobile/android/base/fennec_ids.txt $(PKG_STAGE)/mochitest
endif
TALOS_DIR=$(PKG_STAGE)/talos
stage-talos: make-stage-dir
$(NSINSTALL) -D $(TALOS_DIR)
@(cd $(topsrcdir)/testing/talos && tar $(TAR_CREATE_FLAGS) - *) | (cd $(TALOS_DIR)/ && tar -xf -)
stage-reftest: make-stage-dir
$(MAKE) -C $(DEPTH)/layout/tools/reftest stage-package
@ -601,6 +608,7 @@ stage-instrumentation-tests: make-stage-dir
stage-b2g \
stage-config \
stage-mochitest \
stage-talos \
stage-reftest \
stage-xpcshell \
stage-jstests \

View File

@ -135,6 +135,7 @@ 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
TALOS_PACKAGE = $(PKG_BASENAME).talos.tests.zip
ifneq (,$(wildcard $(DIST)/bin/application.ini))
BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID)

View File

@ -738,6 +738,7 @@ UPLOAD_FILES= \
$(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)$(TALOS_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) \