From c90d9acc4de699ec406bd6c822f001e972be35ae Mon Sep 17 00:00:00 2001 From: Gregory Szorc Date: Thu, 19 Apr 2018 14:21:28 -0700 Subject: [PATCH] Bug 1455143 - Generate test archives into final path; r=ted We currently generate these to dist/ and then use upload.py to copy them into UPLOAD_PATH. This is wasteful. Let's generate the test archives into UPLOAD_PATH directly, if the variable is defined. MozReview-Commit-ID: BHoxZYdxzq4 --HG-- extra : rebase_source : f6d80adb4e1eb7333f0cd3f847fd92cbb75c33bc --- testing/testsuite-targets.mk | 10 ++++++++-- toolkit/mozapps/installer/upload-files.mk | 9 --------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk index 3e6c7ad14da6..b72a54271693 100644 --- a/testing/testsuite-targets.mk +++ b/testing/testsuite-targets.mk @@ -143,14 +143,20 @@ test-packages-manifest: $(foreach pkg,$(TEST_PKGS_ZIP),$(call PKG_ARG,$(pkg),zip)) \ $(foreach pkg,$(TEST_PKGS_TARGZ),$(call PKG_ARG,$(pkg),tar.gz)) +ifdef UPLOAD_PATH +test_archive_dir = $(UPLOAD_PATH) +else +test_archive_dir = $(DIST)/$(PKG_PATH) +endif + package-tests-prepare-dest: - $(NSINSTALL) -D $(DIST)/$(PKG_PATH) + $(NSINSTALL) -D $(test_archive_dir) define package_archive package-tests-$(1): stage-all package-tests-prepare-dest $$(call py_action,test_archive, \ $(1) \ - '$$(abspath $$(DIST))/$$(PKG_PATH)/$$(PKG_BASENAME).$(1).tests.$(2)') + '$$(abspath $$(test_archive_dir))/$$(PKG_BASENAME).$(1).tests.$(2)') package-tests: package-tests-$(1) endef diff --git a/toolkit/mozapps/installer/upload-files.mk b/toolkit/mozapps/installer/upload-files.mk index 131fa1e1be53..d36e57a2c729 100644 --- a/toolkit/mozapps/installer/upload-files.mk +++ b/toolkit/mozapps/installer/upload-files.mk @@ -386,15 +386,6 @@ UPLOAD_FILES= \ $(call QUOTED_WILDCARD,$(DIST)/$(LANGPACK)) \ $(call QUOTED_WILDCARD,$(wildcard $(DIST)/$(PARTIAL_MAR))) \ $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(MOZHARNESS_PACKAGE)) \ - $(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)$(TALOS_PACKAGE)) \ - $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(AWSY_PACKAGE)) \ - $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(REFTEST_PACKAGE)) \ - $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(WP_TEST_PACKAGE)) \ - $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(GTEST_PACKAGE)) \ $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip) \ $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(GENERATED_SOURCE_FILE_PACKAGE)) \ $(call QUOTED_WILDCARD,$(MOZ_SOURCESTAMP_FILE)) \