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:36:18 -0400
changeset 30807 2c8a2f8ff9d8a6cd9673eba104923c988a1067c5
parent 30803 973c61c272654387f1fbb4dabc92b1427586ca6b
child 30808 afb461fe599735fb9f065f17cecc671d6ccef69b
push id1
push userclokep@gmail.com
push dateMon, 07 May 2018 22:45:56 +0000
treeherdercomm-esr60@57eacde5ef40 [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
@@ -45,17 +45,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
@@ -80,10 +80,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