Bug 552253 - XPCShell no longer packages devicemanager.py properly r=ted
authorClint Talbert <ctalbert@mozilla.com>
Wed, 24 Mar 2010 10:51:17 -0700
changeset 39784 66d31d382c6cf4f310ccad8810808e4004b35598
parent 39783 ca2b595942d1ae4d20ca03e8502ed0ab6a58102e
child 39785 b33e7b78457007619afbacf1218dedf6bf720ff9
push idunknown
push userunknown
push dateunknown
reviewersted
bugs552253
milestone1.9.3a4pre
Bug 552253 - XPCShell no longer packages devicemanager.py properly r=ted
testing/xpcshell/Makefile.in
--- a/testing/xpcshell/Makefile.in
+++ b/testing/xpcshell/Makefile.in
@@ -57,20 +57,24 @@ include $(topsrcdir)/config/rules.mk
 TEST_HARNESS_FILES := \
   runxpcshelltests.py \
   remotexpcshelltests.py \
   head.js \
   $(NULL)
 
 # Extra files needed from $(topsrcdir)/build
 EXTRA_BUILD_FILES := \
-  mobile/devicemanager.py \
   automationutils.py \
   $(NULL)
 
+# And files for running xpcshell remotely from $(topsrcdir)/build/mobile
+MOBILE_BUILD_FILES := \
+  devicemanager.py \
+  $(NULL)
+
 # Components / typelibs that don't get packaged with
 # the build, but that we need for the test harness.
 TEST_HARNESS_COMPONENTS := \
   httpd.js \
   $(NULL)
 
 ifdef MOZ_CRASHREPORTER
 #XXX: should find a better way to do this
@@ -79,10 +83,11 @@ endif
 
 # Rules for staging the necessary harness bits for a test package
 PKG_STAGE = $(DIST)/test-package-stage
 
 stage-package:
 	$(NSINSTALL) -D $(PKG_STAGE)/xpcshell/tests
 	@(cd $(srcdir) && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_FILES)) | (cd $(PKG_STAGE)/xpcshell && tar -xf -)
 	@(cd $(topsrcdir)/build && tar $(TAR_CREATE_FLAGS) - $(EXTRA_BUILD_FILES)) | (cd $(PKG_STAGE)/xpcshell && tar -xf -)
+	@(cd $(topsrcdir)/build/mobile && tar $(TAR_CREATE_FLAGS) - $(MOBILE_BUILD_FILES)) | (cd $(PKG_STAGE)/xpcshell && tar -xf -)
 	@(cd $(DEPTH)/_tests/xpcshell/ && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/xpcshell/tests && tar -xf -)
 	@(cd $(DIST)/bin/components && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_COMPONENTS)) | (cd $(PKG_STAGE)/bin/components && tar -xf -)