Fix busted XPCShell tests due to bug 757460 and bug 755339 landing on mozilla-central. r+a=bustage-fix.
authorMike Conley <mconley@mozilla.com>
Fri, 08 Jun 2012 15:35:57 -0400
changeset 12337 95a613ebd8a7ac016004d561eca7c0b4e5f92752
parent 12336 89e29f9ab6fbac90dc4890e0a45a221c2fda35e3
child 12338 a96cf43163c6252088e1f47f9da83f2bbc9479da
push id599
push usermconley@mozilla.com
push dateMon, 16 Jul 2012 20:33:12 +0000
treeherdercomm-beta@c3489d5b7b65 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs757460, 755339
Fix busted XPCShell tests due to bug 757460 and bug 755339 landing on mozilla-central. r+a=bustage-fix.
mail/testsuite-targets.mk
--- a/mail/testsuite-targets.mk
+++ b/mail/testsuite-targets.mk
@@ -49,17 +49,17 @@ mozmill-one:
 	--symbols-path=$(call core_abspath,$(DIST)/crashreporter-symbols) \
 	$(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
+package-tests:: stage-mozilla-tests stage-mozmill stage-modules
 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
@@ -84,10 +84,15 @@ stage-mozilla-tests: make-stage-dir
 
 # Although we should probably depend on make-stage-dir here, we don't as the
 # make-stage-dir actually removes the package directory for us. Given that we
 # are running stage-mozilla-tests which calls testing/testsuite-targets.mk which
 # does do this for some tests, then we're actually fine.
 stage-mozmill: make-stage-dir
 	$(MAKE) -C $(DEPTH)/mail/test/mozmill stage-package
 
+# This will get replaced by actual logic in a subsequent patch.
+stage-modules: make-stage-dir
+	$(NSINSTALL) -D $(PKG_STAGE)/modules
+	$(TOUCH) $(PKG_STAGE)/modules/.dummy
+
 .PHONY: \
-  package-tests make-stage-dir stage-mozmill
+  package-tests make-stage-dir stage-mozmill stage-modules