Backout bug 680203 - Make Lightning tests work with packaged-tests.
authorPhilipp Kewisch <mozilla@kewis.ch>
Sun, 20 Apr 2014 09:41:19 +0200
changeset 19877 ad94d483149f5aa0dec807a79bc8f1fbe2c28c90
parent 19876 f79b49f9149ccf471c2d823d341a7569085913e1
child 19878 d3e56e118e43d5a1c676aadfa25d98915b6135f4
push id1151
push usermbanner@mozilla.com
push dateMon, 09 Jun 2014 22:14:36 +0000
treeherdercomm-beta@ce127428ad7d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs680203
Backout bug 680203 - Make Lightning tests work with packaged-tests.
calendar/lightning/Makefile.in
mail/app/Makefile.in
mail/testsuite-targets.mk
--- a/calendar/lightning/Makefile.in
+++ b/calendar/lightning/Makefile.in
@@ -115,17 +115,16 @@ GRE_BUILDID = $(shell $(PYTHON) $(MOZILL
 DEFINES += -DGRE_BUILDID=$(GRE_BUILDID)
 
 # xxx todo: unless our packaging story is revised (bug 406579) we package up timezones.sqlite
 libs::
 	$(NSINSTALL) -m 0644 $(srcdir)/../timezones/timezones.sqlite $(FINAL_TARGET)
 
 include $(topsrcdir)/config/rules.mk
 include $(srcdir)/lightning-packager.mk
-include $(srcdir)/lightning-tests.mk
 
 # For Lightning, we also need to preprocess the l10n prefs
 repack-process-extrafiles: lightning-extrafiles
 lightning-extrafiles: LOCALE_BASEDIR=$(call EXPAND_LOCALE_SRCDIR,calendar/locales)
 lightning-extrafiles:
 	$(call py_action,preprocessor,$(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $(LOCALE_BASEDIR)/lightning-l10n.js  -o $(DIST)/$(UNIVERSAL_PATH)xpi-stage/$(L10N_XPI_NAME)/$(PREF_DIR)/lightning-l10n.js)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@@ -188,16 +188,24 @@ install::
 endif
 
 libs:: $(srcdir)/profile/prefs.js
 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile
 
 libs:: $(srcdir)/blocklist.xml
 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin
 
+ifdef ENABLE_TESTS
+# Bug 680203 - When making and running packaged tests on our buildbots,
+# Lightning is not included in the package, so Lightning tests cannot run
+# properly even though we build Lightning.
+libs::
+	sed -e '/calendar/d' $(MOZDEPTH)/_tests/xpcshell/xpcshell.ini >$(MOZDEPTH)/_tests/xpcshell/all-test-dirs.list
+endif
+
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 
 MAC_APP_NAME = $(MOZ_APP_DISPLAYNAME)
 
 ifdef MOZ_DEBUG
 MAC_APP_NAME := $(MAC_APP_NAME)Debug
 endif
 
--- a/mail/testsuite-targets.mk
+++ b/mail/testsuite-targets.mk
@@ -47,38 +47,32 @@ mozmill-one:
 	$(MOZMILL_EXTRA)
 
 # XXX The mozilla/testing/testsuite-targets.mk doesn't really allow for hooks
 # outside of itself. Therefore we replicate the functionality we need here,
 # calling into the relevant mozilla dirs when necessary for the core tests.
 ifndef UNIVERSAL_BINARY
 PKG_STAGE = $(DIST)/test-package-stage
 package-tests:: stage-mozilla-tests stage-mozmill stage-modules
-
-# If Lightning is enabled, also stage the lightning extension
-ifdef MOZ_CALENDAR
-package-tests:: stage-calendar
-endif
-
 else
 # This staging area has been built for us by universal/flight.mk
 PKG_STAGE = $(DIST)/universal/test-package-stage
 endif
 
 package-tests::
 	@rm -f "$(DIST)/$(PKG_PATH)$(TEST_PACKAGE)"
 ifndef UNIVERSAL_BINARY
 	$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
 endif
 	cd $(PKG_STAGE) && \
 	  zip -r9D "$(abspath $(DIST))/$(PKG_PATH)$(TEST_PACKAGE)" \
 	  * -x \*/.mkdir.done
 
 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)/extensions
+	rm -rf $(PKG_STAGE) && $(NSINSTALL) -D $(PKG_STAGE) && $(NSINSTALL) -D $(PKG_STAGE)/bin && $(NSINSTALL) -D $(PKG_STAGE)/bin/components && $(NSINSTALL) -D $(PKG_STAGE)/certs
 
 # Of the core tests, we only currently support xpcshell. Unfortunately
 # some of the required xpcshell bits are packaged by mochitest, so we have to
 # package those as well.
 stage-mozilla-tests: make-stage-dir
 	$(MAKE) -C $(DEPTH)/mozilla/layout/tools/reftest stage-package
 	$(MAKE) -C $(DEPTH)/mozilla/testing/mochitest stage-package
 	$(MAKE) -C $(DEPTH)/mozilla/testing/xpcshell stage-package
@@ -90,13 +84,10 @@ stage-mozilla-tests: make-stage-dir
 # does do this for some tests, then we're actually fine.
 stage-mozmill: make-stage-dir
 	$(MAKE) -C $(DEPTH)/mail/test/mozmill stage-package
 
 stage-modules: make-stage-dir
 	$(NSINSTALL) -D $(PKG_STAGE)/modules
 	cp -RL $(DEPTH)/mozilla/_tests/modules $(PKG_STAGE)
 
-stage-calendar: make-stage-dir
-	$(MAKE) -C $(DEPTH)/calendar/lightning stage-package
-
 .PHONY: \
-  package-tests make-stage-dir stage-mozmill stage-modules stage-calendar
+  package-tests make-stage-dir stage-mozmill stage-modules