Fix test packaging and execution from bug 568691.
authorBenjamin Smedberg <benjamin@smedbergs.us>
Tue, 22 Jun 2010 20:44:44 -0400
changeset 47030 097b162ce2e00e5330c9d92fb545e74d050e0ca7
parent 47029 014f02585f6d28185f8e0078c0fa86a4ad7113d4
child 47031 6a521c28132e993be14e8190c2de37603cf2a369
push idunknown
push userunknown
push dateunknown
bugs568691
milestone1.9.3a6pre
Fix test packaging and execution from bug 568691.
layout/tools/reftest/Makefile.in
netwerk/test/httpserver/httpd.manifest
testing/xpcshell/Makefile.in
--- a/layout/tools/reftest/Makefile.in
+++ b/layout/tools/reftest/Makefile.in
@@ -86,19 +86,17 @@ endif
 	$(NSINSTALL) -D $@
 
 $(_HARNESS_FILES): $(_DEST_DIR)
 
 # copy harness and the reftest extension bits to $(_DEST_DIR)
 copy-harness: $(_HARNESS_FILES)
 	$(INSTALL) $(_HARNESS_FILES) $(_DEST_DIR)
 	(cd $(DIST)/xpi-stage && tar $(TAR_CREATE_FLAGS) - reftest) | (cd $(_DEST_DIR) && tar -xf -)
-	$(INSTALL) $(DIST)/bin/components/httpd.js $(_DEST_DIR)/reftest/components
-# need to get httpd.js into components.list so it loads
-	@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(_DEST_DIR)/reftest/components/components.list httpd.js
+	$(INSTALL) $(DIST)/bin/components/httpd.js $(DIST)/bin/components/httpd.manifest $(_DEST_DIR)/reftest/components
 	$(INSTALL) $(DIST)/bin/components/test_necko.xpt $(_DEST_DIR)/reftest/components
 
 PKG_STAGE = $(DIST)/test-package-stage
 
 # stage harness and tests for packaging
 stage-package:
 	$(NSINSTALL) -D $(PKG_STAGE)/reftest && $(NSINSTALL) -D $(PKG_STAGE)/reftest/tests
 	@(cd $(DEPTH)/_tests/reftest/ && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/reftest && tar -xf -)
--- a/netwerk/test/httpserver/httpd.manifest
+++ b/netwerk/test/httpserver/httpd.manifest
@@ -1,2 +1,2 @@
 component {54ef6f81-30af-4b1d-ac55-8ba811293e41} httpd.js
-contract 54ef6f81-30af-4b1d-ac55-8ba811293e41 {@mozilla.org/server/jshttp;1}
\ No newline at end of file
+contract @mozilla.org/server/jshttp;1 {54ef6f81-30af-4b1d-ac55-8ba811293e41}
--- a/testing/xpcshell/Makefile.in
+++ b/testing/xpcshell/Makefile.in
@@ -70,16 +70,17 @@ EXTRA_BUILD_FILES := \
 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 \
+  httpd.manifest \
   $(NULL)
 
 ifdef MOZ_CRASHREPORTER
 #XXX: should find a better way to do this
 TEST_HARNESS_COMPONENTS +=  crashreporter_test.xpt
 endif
 
 ifdef MOZ_ENABLE_LIBXUL