From aa4b2090a4d9b83e7388dfd3d072bf35e864a311 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Pag=C3=A8s?= <j.parkouss@gmail.com>
Date: Thu, 27 Aug 2015 10:51:32 +0200
Subject: [PATCH] Bug 787200 - Move the Talos code into mozilla-central: create
 the talos test .zip file. r=ted

---
 build/gen_test_packages_manifest.py       | 2 ++
 testing/testsuite-targets.mk              | 8 ++++++++
 toolkit/mozapps/installer/package-name.mk | 1 +
 toolkit/mozapps/installer/upload-files.mk | 1 +
 4 files changed, 12 insertions(+)

diff --git a/build/gen_test_packages_manifest.py b/build/gen_test_packages_manifest.py
index e6437ec2b14..d762e583592 100644
--- a/build/gen_test_packages_manifest.py
+++ b/build/gen_test_packages_manifest.py
@@ -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',
 ]
 
 
diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk
index dafe0666c0f..1e99d205691 100644
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -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 \
diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk
index 946d2beccf9..70810b3f906 100644
--- a/toolkit/mozapps/installer/package-name.mk
+++ b/toolkit/mozapps/installer/package-name.mk
@@ -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)
diff --git a/toolkit/mozapps/installer/upload-files.mk b/toolkit/mozapps/installer/upload-files.mk
index 7489d218b19..5db39d3fd60 100644
--- a/toolkit/mozapps/installer/upload-files.mk
+++ b/toolkit/mozapps/installer/upload-files.mk
@@ -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) \