Bug 920418 - Port bug 901990 install test files through manifests - to fix bustage. rs=build-peer port of m-c bug for CLOSED TREE

config/rules.mk

@@ -120,82 +120,10 @@ endif
 # Testing frameworks support
 ################################################################################
 
-testxpcobjdir = $(MOZDEPTH)/_tests/xpcshell
-
 ifdef ENABLE_TESTS
 
 DIRS += $(TEST_DIRS)
 
-ifdef XPCSHELL_TESTS
-ifndef relativesrcdir
-$(error Must define relativesrcdir when defining XPCSHELL_TESTS.)
-endif
-
-define _INSTALL_TESTS
-$(DIR_INSTALL) $(wildcard $(srcdir)/$(dir)/*) $(testxpcobjdir)/$(relativesrcdir)/$(dir)
-
-endef # do not remove the blank line!
-
-SOLO_FILE ?= $(error Specify a test filename in SOLO_FILE when using check-interactive or check-one)
-
-libs::
-	$(foreach dir,$(XPCSHELL_TESTS),$(_INSTALL_TESTS))
-	$(call py_action,xpccheck,$(topsrcdir) $(addprefix $(topsrcdir)/$(relativesrcdir)/,$(XPCSHELL_TESTS)))
-
-testxpcsrcdir = $(MOZILLA_SRCDIR)/testing/xpcshell
-
-# Execute all tests in the $(XPCSHELL_TESTS) directories.
-# See also $(MOZILLA_DIR)/testing/testsuite-targets.mk 'xpcshell-tests' target for global execution.
-xpcshell-tests:
-	$(PYTHON) -u $(MOZILLA_DIR)/config/pythonpath.py \
-	  -I$(MOZDEPTH)/build \
-	  -I$(MOZILLA_DIR)/build -I$(MOZDEPTH)/_tests/mozbase/mozinfo \
-	  $(testxpcsrcdir)/runxpcshelltests.py \
-	  --symbols-path=$(DIST)/crashreporter-symbols \
-	  --build-info-json=$(MOZDEPTH)/mozinfo.json \
-	  --tests-root-dir=$(testxpcobjdir) \
-	  --testing-modules-dir=$(MOZDEPTH)/_tests/modules \
-	  --xunit-file=$(testxpcobjdir)/$(relativesrcdir)/results.xml \
-	  --xunit-suite-name=xpcshell \
-	  $(EXTRA_TEST_ARGS) \
-	  $(LIBXUL_DIST)/bin/xpcshell \
-	  $(foreach dir,$(XPCSHELL_TESTS),$(testxpcobjdir)/$(relativesrcdir)/$(dir))
-
-# Execute a single test, specified in $(SOLO_FILE), but don't automatically
-# start the test. Instead, present the xpcshell prompt so the user can
-# attach a debugger and then start the test.
-check-interactive:
-	$(PYTHON) -u $(MOZILLA_DIR)/config/pythonpath.py \
-	  -I$(MOZDEPTH)/build \
-	  -I$(MOZILLA_DIR)/build -I$(MOZDEPTH)/_tests/mozbase/mozinfo \
-	  $(testxpcsrcdir)/runxpcshelltests.py \
-	  --symbols-path=$(DIST)/crashreporter-symbols \
-	  --build-info-json=$(MOZDEPTH)/mozinfo.json \
-	  --test-path=$(SOLO_FILE) \
-	  --testing-modules-dir=$(MOZDEPTH)/_tests/modules \
-	  --profile-name=$(MOZ_APP_NAME) \
-	  --interactive \
-	  $(LIBXUL_DIST)/bin/xpcshell \
-	  $(foreach dir,$(XPCSHELL_TESTS),$(testxpcobjdir)/$(relativesrcdir)/$(dir))
-
-# Execute a single test, specified in $(SOLO_FILE)
-check-one:
-	$(PYTHON) -u $(MOZILLA_DIR)/config/pythonpath.py \
-	  -I$(MOZDEPTH)/build \
-	  -I$(MOZILLA_DIR)/build -I$(MOZDEPTH)/_tests/mozbase/mozinfo \
-	  $(testxpcsrcdir)/runxpcshelltests.py \
-	  --symbols-path=$(DIST)/crashreporter-symbols \
-	  --build-info-json=$(MOZDEPTH)/mozinfo.json \
-	  --test-path=$(SOLO_FILE) \
-	  --testing-modules-dir=$(MOZDEPTH)/_tests/modules \
-	  --profile-name=$(MOZ_APP_NAME) \
-	  --verbose \
-	  $(EXTRA_TEST_ARGS) \
-	  $(LIBXUL_DIST)/bin/xpcshell \
-	  $(foreach dir,$(XPCSHELL_TESTS),$(testxpcobjdir)/$(relativesrcdir)/$(dir))
-
-endif # XPCSHELL_TESTS
-
 ifdef CPP_UNIT_TESTS
 
 # Compile the tests to $(DIST)/bin.  Make lots of niceties available by default

mail/base/test/unit/xpcshell.ini

@@ -2,6 +2,7 @@
 head = head_mailbase.js
 tail = tail_base.js
 run-sequentially = Avoid bustage.
+support-files = distribution.ini resources/*
 
 [test_alertHook.js]
 [test_attachmentChecker.js]

mailnews/addrbook/test/unit/xpcshell.ini

@@ -2,6 +2,7 @@
 head = head_addrbook.js
 tail = tail_addrbook.js
 run-sequentially = Avoid bustage.
+support-files = data/*
 
 [test_basic_nsIAbCard.js]
 [test_basic_nsIAbDirectory.js]

mailnews/base/test/unit/xpcshell.ini

@@ -2,6 +2,7 @@
 head = head_mailbase.js
 tail = tail_base.js
 run-sequentially = Avoid bustage.
+support-files = nodelist_test.xml data/*
 
 [test_accountMgr.js]
 [test_accountMgrCustomTypes.js]

mailnews/compose/test/unit/xpcshell.ini

@@ -2,6 +2,7 @@
 head = head_compose.js
 tail = tail_compose.js
 run-sequentially = Avoid bustage.
+support-files = data/*
 
 [test_attachment.js]
 [test_attachment_intl.js]
@@ -33,4 +34,3 @@ run-sequentially = Avoid bustage.
 [test_splitRecipients.js]
 [test_staleTemporaryFileCleanup.js]
 [test_temporaryFilesRemoved.js]
-[test_temporaryFilesRemoved.js]

mailnews/db/gloda/test/unit/xpcshell.ini

@@ -2,6 +2,7 @@
 head = head_gloda.js
 tail = tail_gloda.js
 run-sequentially = Avoid bustage.
+support-files = base_*.js resources/*
 
 [test_cleanup_msf_databases.js]
 [test_corrupt_database.js]

mailnews/extensions/bayesian-spam-filter/test/unit/xpcshell.ini

@@ -2,6 +2,7 @@
 head = head_bayes.js
 tail = tail_bayesian.js
 run-sequentially = Avoid bustage.
+support-files = resources/*
 
 [test_bug228675.js]
 [test_customTokenization.js]

mailnews/import/test/unit/xpcshell.ini

@@ -2,6 +2,7 @@
 head = head_import.js
 tail = tail_import.js
 run-sequentially = Avoid bustage.
+support-files = resources/*
 
 [test_bug_263304.js]
 [test_bug_437556.js]

mailnews/local/test/unit/xpcshell.ini

@@ -2,6 +2,7 @@
 head = head_maillocal.js
 tail = tail_local.js
 run-sequentially = Avoid bustage.
+support-files = data/*
 
 [test_bug457168.js]
 [test_fileName.js]

mailnews/news/test/unit/xpcshell.ini

@@ -2,6 +2,7 @@
 head = head_server_setup.js
 tail = tail_news.js
 run-sequentially = Avoid bustage.
+support-files = postings/*
 
 [test_biff.js]
 [test_bug37465.js]