Bug 658878 - [SeaMonkey] comm-central busted due to bug 616999 and bug 658666/ switching xpcshell to manifests r=neil
authorIan Neal <iann_cvs@blueyonder.co.uk>
Tue, 24 May 2011 00:49:17 +0100
changeset 7807 f5cf5a4445409724abba0976dd1cae7ae3ccaa5f
parent 7806 5d098294efd2601777dcdb3afa0748049a463f03
child 7809 45c1585e47a2640830de35c5ac168e9a02eaae4b
push id5999
push useriann_cvs@blueyonder.co.uk
push dateMon, 23 May 2011 23:51:15 +0000
treeherdercomm-central@f5cf5a444540 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersneil
bugs658878, 616999, 658666
Bug 658878 - [SeaMonkey] comm-central busted due to bug 616999 and bug 658666/ switching xpcshell to manifests r=neil
suite/app/Makefile.in
suite/common/places/tests/unit/xpcshell.ini
suite/test/xpcshell.ini
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -295,16 +295,23 @@ ifeq ($(OS_ARCH),WINNT)
 	$(PERL) -pe 's/(?<!\r)\n/\r\n/g;' < $(topsrcdir)/suite/installer/license.txt > $(DIST)/bin/license.txt
 else
 	$(INSTALL) $(topsrcdir)/suite/installer/license.txt $(DIST)/bin/
 endif
 
 libs:: blocklist.xml
 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin
 
+# XXX This is a hack to ensure that we get the right xpcshell.ini for our tests.
+# mozilla-central does this in testing/xpcshell-tests which means that it is
+# very hard for anyone to specify anything else.
+libs::
+	$(INSTALL) $(topsrcdir)/suite/test/xpcshell.ini $(MOZDEPTH)/_tests/xpcshell
+	cp $(topsrcdir)/suite/test/xpcshell.ini $(MOZDEPTH)/_tests/xpcshell/all-test-dirs.list
+
 ifdef MOZ_OMNIJAR
 # Make extensions end up as XPIs instead of flat chrome when doing omni.jar.
 # APP_EXTENSIONS exist only bundled with the application,
 # PROFILE_EXTENSIONS will be copied to the profile in installed builds.
 # NOTE: This is a hack to run this at the end of compilation, would be nicer
 # if this was done right away for built-in extensions in omnijar mode.
 # Listed extension GUIDs:
 # 972ce4c6-... Classic Theme, 59c81df5-... ChatZilla, f13b157f-... Venkman
new file mode 100644
--- /dev/null
+++ b/suite/common/places/tests/unit/xpcshell.ini
@@ -0,0 +1,23 @@
+[DEFAULT]
+head = head_bookmarks.js
+tail = 
+
+[test_384370.js]
+[test_398914.js]
+[test_421483.js]
+[test_457441-import-export-corrupt-bookmarks-html.js]
+[test_bookmarks_html.js]
+[test_bookmarksRestoreNotification.js]
+[test_browserGlue_corrupt.js]
+[test_browserGlue_corrupt_nobackup_default.js]
+[test_browserGlue_corrupt_nobackup.js]
+[test_browserGlue_distribution.js]
+[test_browserGlue_migrate.js]
+[test_browserGlue_prefs.js]
+[test_browserGlue_restore.js]
+[test_browserGlue_shutdown.js]
+[test_browserGlue_smartBookmarks.js]
+[test_clearHistory_shutdown.js]
+[test_leftpane_corruption_handling.js]
+[test_placesTxn.js]
+[test_txnGUIDs.js]
new file mode 100644
--- /dev/null
+++ b/suite/test/xpcshell.ini
@@ -0,0 +1,132 @@
+# XXX Included here because bug 658671 means we can't nest includes.
+[include:suite/common/places/tests/unit/xpcshell.ini]
+[include:mailnews/addrbook/test/unit/xpcshell.ini]
+[include:mailnews/base/test/unit/xpcshell.ini]
+[include:mailnews/compose/test/unit/xpcshell.ini]
+[include:mailnews/db/gloda/test/unit/xpcshell.ini]
+[include:mailnews/db/msgdb/test/unit/xpcshell.ini]
+[include:mailnews/extensions/mdn/test/unit/xpcshell.ini]
+[include:mailnews/extensions/bayesian-spam-filter/test/unit/xpcshell.ini]
+[include:mailnews/imap/test/unit/xpcshell.ini]
+[include:mailnews/import/test/unit/xpcshell.ini]
+[include:mailnews/local/test/unit/xpcshell.ini]
+[include:mailnews/mime/test/unit/xpcshell.ini]
+[include:mailnews/news/test/unit/xpcshell.ini]
+[include:ldap/xpcom/tests/unit/xpcshell.ini]
+
+# XXX Included here because bug 658671 means we can't nest includes.
+[include:mozilla/chrome/test/unit/xpcshell.ini]
+[include:mozilla/intl/locale/tests/unit/xpcshell.ini]
+[include:mozilla/netwerk/cookie/test/unit/xpcshell.ini]
+[include:mozilla/modules/libjar/zipwriter/test/unit/xpcshell.ini]
+[include:mozilla/uriloader/exthandler/tests/unit/xpcshell.ini]
+[include:mozilla/parser/xml/test/unit/xpcshell.ini]
+[include:mozilla/modules/libpr0n/test/unit/xpcshell.ini]
+[include:mozilla/modules/plugin/test/unit/xpcshell.ini]
+[include:mozilla/dom/plugins/test/unit/xpcshell.ini]
+[include:mozilla/dom/src/json/test/unit/xpcshell.ini]
+[include:mozilla/dom/tests/unit/xpcshell.ini]
+[include:mozilla/content/xtf/test/unit/xpcshell.ini]
+[include:mozilla/docshell/test/unit/xpcshell.ini]
+[include:mozilla/embedding/tests/unit/xpcshell.ini]
+[include:mozilla/toolkit/components/commandlines/test/unit/xpcshell.ini]
+[include:mozilla/toolkit/components/contentprefs/tests/unit/xpcshell.ini]
+[include:mozilla/toolkit/components/passwordmgr/test/unit/xpcshell.ini]
+[include:mozilla/toolkit/components/places/tests/migration/xpcshell.ini]
+[include:mozilla/toolkit/components/places/tests/autocomplete/xpcshell.ini]
+[include:mozilla/toolkit/components/places/tests/expiration/xpcshell.ini]
+[include:mozilla/toolkit/components/places/tests/sync/xpcshell.ini]
+[include:mozilla/toolkit/components/places/tests/bookmarks/xpcshell.ini]
+[include:mozilla/toolkit/components/places/tests/queries/xpcshell.ini]
+[include:mozilla/toolkit/components/places/tests/unit/xpcshell.ini]
+[include:mozilla/toolkit/components/places/tests/network/xpcshell.ini]
+[include:mozilla/toolkit/components/urlformatter/tests/unit/xpcshell.ini]
+[include:mozilla/toolkit/components/ctypes/tests/unit/xpcshell.ini]
+[include:mozilla/toolkit/components/autocomplete/tests/unit/xpcshell.ini]
+[include:mozilla/toolkit/components/satchel/test/unit/xpcshell.ini]
+[include:mozilla/toolkit/components/downloads/test/unit/xpcshell.ini]
+[include:mozilla/toolkit/components/downloads/test/schema_migration/xpcshell.ini]
+[include:mozilla/toolkit/components/telemetry/tests/unit/xpcshell.ini]
+[include:mozilla/toolkit/content/tests/unit/xpcshell.ini]
+[include:mozilla/toolkit/mozapps/downloads/tests/unit/xpcshell.ini]
+[include:mozilla/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini]
+[include:mozilla/toolkit/mozapps/extensions/test/xpcshell-unpack/xpcshell.ini]
+[include:mozilla/toolkit/mozapps/update/test_timermanager/unit/xpcshell.ini]
+[include:mozilla/toolkit/mozapps/update/test/unit/xpcshell.ini]
+[include:mozilla/security/manager/ssl/tests/unit/xpcshell.ini]
+[include:mozilla/testing/xpcshell/example/unit/xpcshell.ini]
+[include:mozilla/xpcom/tests/unit/xpcshell.ini]
+[include:mozilla/modules/libpref/test/unit/xpcshell.ini]
+[include:mozilla/intl/strres/tests/unit/xpcshell.ini]
+[include:mozilla/intl/unicharutil/tests/unit/xpcshell.ini]
+[include:mozilla/intl/uconv/tests/unit/xpcshell.ini]
+[include:mozilla/netwerk/test/unit/xpcshell.ini]
+[include:mozilla/netwerk/test/httpserver/test/xpcshell.ini]
+[include:mozilla/js/jetpack/tests/unit/xpcshell.ini]
+[include:mozilla/js/src/xpconnect/tests/unit/xpcshell.ini]
+[include:mozilla/modules/libjar/test/unit/xpcshell.ini]
+[include:mozilla/extensions/cookie/test/unit/xpcshell.ini]
+[include:mozilla/storage/test/unit/xpcshell.ini]
+[include:mozilla/rdf/tests/unit/xpcshell.ini]
+[include:mozilla/gfx/tests/unit/xpcshell.ini]
+[include:mozilla/widget/tests/unit/xpcshell.ini]
+[include:mozilla/content/base/test/unit/xpcshell.ini]
+[include:mozilla/content/test/unit/xpcshell.ini]
+[include:mozilla/toolkit/components/url-classifier/tests/unit/xpcshell.ini]
+[include:mozilla/services/crypto/tests/unit/xpcshell.ini]
+[include:mozilla/services/crypto/components/tests/unit/xpcshell.ini]
+[include:mozilla/services/sync/tests/unit/xpcshell.ini]
+[include:mozilla/browser/components/dirprovider/tests/unit/xpcshell.ini]
+[include:mozilla/browser/components/feeds/test/unit/xpcshell.ini]
+[include:mozilla/browser/components/places/tests/unit/xpcshell.ini]
+[include:mozilla/browser/components/privatebrowsing/test/unit/xpcshell.ini]
+[include:mozilla/browser/components/shell/test/unit/xpcshell.ini]
+[include:mozilla/extensions/spellcheck/hunspell/tests/unit/xpcshell.ini]
+[include:mozilla/toolkit/components/search/tests/xpcshell/xpcshell.ini]
+[include:mozilla/toolkit/mozapps/shared/test/unit/xpcshell.ini]
+[include:mozilla/services/crypto/component/tests/unit/xpcshell.ini]
+[include:mozilla/layout/tools/layout-debug/tests/unit/xpcshell.ini]
+run-if.config = debug
+
+[include:mozilla/intl/locale/tests_multilocale/unit/xpcshell.ini]
+run-if.toolkit = windows
+
+[include:mozilla/intl/locale/tests_multilocale/unit/xpcshell.ini]
+run-if.toolkit = cocoa
+
+[include:mozilla/toolkit/crashreporter/test/unit/xpcshell.ini]
+skip-if.os = linux
+run-if.config = mozcrashreporter
+
+[include:mozilla/intl/locale/src/unix/tests/unit/xpcshell.ini]
+skip-if.toolkit = windows cocoa os2
+
+[include:mozilla/toolkit/components/commandlines/test/unit_win/xpcshell.ini]
+run-if.os = windows
+
+[include:mozilla/toolkit/components/commandlines/test/unit_unix/xpcshell.ini]
+skip-if.os = windows mac os2
+
+[include:mozilla/chrome/test/unit_ipc/xpcshell.ini]
+run-if.config = ipc
+
+[include:mozilla/extensions/cookie/test/unit_ipc/xpcshell.ini]
+run-if.config = ipc
+
+[include:mozilla/ipc/testshell/tests/xpcshell.ini]
+run-if.config = ipc
+
+[include:mozilla/modules/libpref/test/unit_ipc/xpcshell.ini]
+run-if.config = ipc
+
+[include:mozilla/netwerk/test/unit_ipc/xpcshell.ini]
+run-if.config = ipc
+
+[include:mozilla/netwerk/cookie/test/unit_ipc/xpcshell.ini]
+run-if.config = ipc
+
+[include:mozilla/toolkit/components/contentprefs/tests/unit_ipc/xpcshell.ini]
+run-if.config = ipc
+
+[include:mozilla/uriloader/exthandler/tests/unit_ipc/xpcshell.ini]
+run-if.config = ipc