Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 05:15:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1209628 - Package mozharness alongside other build artifacts instead of 'package-tests', r=gps

Browse Source 
Mozharness isn't part of the test package, so shouldn't really be packaged during 'package-tests'.

--HG--
extra : commitid : LIK7qJMSPHi
extra : rebase_source : 644c8dd6e0e993b063709ba06e9634d52cb6596d
This commit is contained in:
Andrew Halberstadt 2015-09-29 09:03:39 -04:00
parent 106d89e80b
commit c49ce9299f
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
testing/testsuite-targets.mk
View File

@ -422,12 +422,6 @@ package-tests-prepare-dest:
@rm -f '$(DIST)/$(PKG_PATH)$(TEST_PACKAGE)'
$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
package-tests-mozharness: package-tests-prepare-dest
$(call py_action,test_archive, \
mozharness \
$(abspath $(DIST))/$(PKG_PATH)/mozharness.zip)
package-tests: package-tests-mozharness
define package_archive
package-tests-$(1): stage-all package-tests-prepare-dest
$$(call py_action,test_archive, \
@ -565,7 +559,6 @@ stage-instrumentation-tests: make-stage-dir
jstestbrowser \
package-tests \
package-tests-prepare-dest \
package-tests-mozharness \
package-tests-common \
make-stage-dir \
stage-all \

3
toolkit/mozapps/installer/package-name.mk
View File

@ -132,6 +132,9 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME).crashreporter-symbols
# Code coverage package naming
CODE_COVERAGE_ARCHIVE_BASENAME = $(PKG_BASENAME).code-coverage-gcno
# Mozharness naming
MOZHARNESS_PACKAGE = mozharness.zip
# Test package naming
TEST_PACKAGE = $(PKG_BASENAME).common.tests.zip
CPP_TEST_PACKAGE = $(PKG_BASENAME).cppunittest.tests.zip

6
toolkit/mozapps/installer/packager.mk
View File

@ -54,9 +54,13 @@ stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_MANIFEST_DEPS)
$(MOZ_PKG_MANIFEST) $(DIST) $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(if $(MOZ_PKG_MANIFEST),,$(_BINPATH)) \
$(if $(filter omni,$(MOZ_PACKAGER_FORMAT)),$(if $(NON_OMNIJAR_FILES),--non-resource $(NON_OMNIJAR_FILES)))
$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/find-dupes.py $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)
# Package mozharness
$(call py_action,test_archive, \
mozharness \
$(abspath $(DIST))/$(PKG_PATH)$(MOZHARNESS_PACKAGE))
ifndef LIBXUL_SDK
ifdef MOZ_PACKAGE_JSSHELL
# Package JavaScript Shell
# Package JavaScript Shell
@echo 'Packaging JavaScript Shell...'
$(RM) $(PKG_JSSHELL)
$(MAKE_JSSHELL)

1
toolkit/mozapps/installer/upload-files.mk
View File

@ -733,6 +733,7 @@ UPLOAD_FILES= \
$(call QUOTED_WILDCARD,$(DIST)/$(COMPLETE_MAR)) \
$(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)) \