зеркало из https://github.com/mozilla/pjs.git
Backed out changeset 1646f17e51b1 - Patch incorrectly moved to m-i
This commit is contained in:
Родитель
6261e0a71e
Коммит
94ddecfc05
|
@ -233,7 +233,7 @@ include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
|
|||
|
||||
ifndef UNIVERSAL_BINARY
|
||||
PKG_STAGE = $(DIST)/test-package-stage
|
||||
package-tests: stage-mochitest stage-reftest stage-xpcshell stage-jstests stage-jetpack stage-firebug stage-peptest
|
||||
package-tests: stage-mochitest stage-reftest stage-xpcshell stage-jstests stage-jetpack stage-firebug
|
||||
else
|
||||
# This staging area has been built for us by universal/flight.mk
|
||||
PKG_STAGE = $(DIST)/universal/test-package-stage
|
||||
|
@ -255,7 +255,7 @@ package-tests: stage-android
|
|||
endif
|
||||
|
||||
make-stage-dir:
|
||||
rm -rf $(PKG_STAGE) && $(NSINSTALL) -D $(PKG_STAGE) && $(NSINSTALL) -D $(PKG_STAGE)/bin && $(NSINSTALL) -D $(PKG_STAGE)/bin/components && $(NSINSTALL) -D $(PKG_STAGE)/certs && $(NSINSTALL) -D $(PKG_STAGE)/jetpack && $(NSINSTALL) -D $(PKG_STAGE)/firebug && $(NSINSTALL) -D $(PKG_STAGE)/peptest
|
||||
rm -rf $(PKG_STAGE) && $(NSINSTALL) -D $(PKG_STAGE) && $(NSINSTALL) -D $(PKG_STAGE)/bin && $(NSINSTALL) -D $(PKG_STAGE)/bin/components && $(NSINSTALL) -D $(PKG_STAGE)/certs && $(NSINSTALL) -D $(PKG_STAGE)/jetpack && $(NSINSTALL) -D $(PKG_STAGE)/firebug
|
||||
|
||||
stage-mochitest: make-stage-dir
|
||||
$(MAKE) -C $(DEPTH)/testing/mochitest stage-package
|
||||
|
@ -280,12 +280,9 @@ stage-jetpack: make-stage-dir
|
|||
|
||||
stage-firebug: make-stage-dir
|
||||
$(MAKE) -C $(DEPTH)/testing/firebug stage-package
|
||||
|
||||
stage-peptest: make-stage-dir
|
||||
$(MAKE) -C $(DEPTH)/testing/peptest stage-package
|
||||
.PHONY: \
|
||||
mochitest mochitest-plain mochitest-chrome mochitest-a11y mochitest-ipcplugins \
|
||||
reftest crashtest \
|
||||
xpcshell-tests \
|
||||
jstestbrowser \
|
||||
package-tests make-stage-dir stage-mochitest stage-reftest stage-xpcshell stage-jstests stage-android stage-jetpack stage-firebug stage-peptest
|
||||
package-tests make-stage-dir stage-mochitest stage-reftest stage-xpcshell stage-jstests stage-android stage-jetpack stage-firebug
|
||||
|
|
|
@ -891,7 +891,6 @@ if [ "$ENABLE_TESTS" ]; then
|
|||
testing/xpcshell/Makefile
|
||||
testing/xpcshell/example/Makefile
|
||||
testing/firebug/Makefile
|
||||
testing/peptest/Makefile
|
||||
toolkit/components/alerts/test/Makefile
|
||||
toolkit/components/autocomplete/tests/Makefile
|
||||
toolkit/components/commandlines/test/Makefile
|
||||
|
|
|
@ -267,6 +267,5 @@ ifdef ENABLE_TESTS
|
|||
tier_platform_dirs += testing/mochitest
|
||||
tier_platform_dirs += testing/xpcshell
|
||||
tier_platform_dirs += testing/tools/screenshot
|
||||
tier_platform_dirs += testing/peptest
|
||||
endif
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче