Fix permanent orange from bug 755196 by porting the rest of bug 755339 to copy the modules directory into the packaged tests file. r=bustage-fix
authorMark Banner <bugzilla@standard8.plus.com>
Tue, 10 Jul 2012 15:08:29 -0400
changeset 12834 af0fb78b4713f39b3870c9e5e8a7cdc8bda9e55e
parent 12833 ec94f604e49768bf18ae47fd238204c98c24d81b
child 12835 c9097070b4135b14d1088c64413fd4ada2f98c6c
push id654
push userbugzilla@standard8.plus.com
push dateMon, 27 Aug 2012 20:27:17 +0000
treeherdercomm-beta@f9b6f18872f3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs755196, 755339
Fix permanent orange from bug 755196 by porting the rest of bug 755339 to copy the modules directory into the packaged tests file. r=bustage-fix
mail/testsuite-targets.mk
--- a/mail/testsuite-targets.mk
+++ b/mail/testsuite-targets.mk
@@ -84,15 +84,14 @@ 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
+	cp -RL $(DEPTH)/mozilla/_tests/modules $(PKG_STAGE)
 
 .PHONY: \
   package-tests make-stage-dir stage-mozmill stage-modules