Fix test packaging and execution from bug 568691.

This commit is contained in:
Benjamin Smedberg 2010-06-22 20:44:44 -04:00
parent 3f7e71abfb
commit ea00533489
3 changed files with 3 additions and 4 deletions

View File

@ -91,9 +91,7 @@ $(_HARNESS_FILES): $(_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

View File

@ -1,2 +1,2 @@
component {54ef6f81-30af-4b1d-ac55-8ba811293e41} httpd.js
contract 54ef6f81-30af-4b1d-ac55-8ba811293e41 {@mozilla.org/server/jshttp;1}
contract @mozilla.org/server/jshttp;1 {54ef6f81-30af-4b1d-ac55-8ba811293e41}

View File

@ -75,6 +75,7 @@ MOBILE_BUILD_FILES := \
# the build, but that we need for the test harness.
TEST_HARNESS_COMPONENTS := \
httpd.js \
httpd.manifest \
$(NULL)
ifdef MOZ_CRASHREPORTER