--- a/calendar/test/Makefile.in
+++ b/calendar/test/Makefile.in
@@ -5,11 +5,9 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
-XPCSHELL_TESTS = unit
-
include $(topsrcdir)/config/rules.mk
--- a/calendar/test/moz.build
+++ b/calendar/test/moz.build
@@ -1,7 +1,9 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DIRS += ['mozmill']
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
--- a/chat/modules/Makefile.in
+++ b/chat/modules/Makefile.in
@@ -1,16 +1,17 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
+relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
EXTRA_JS_MODULES = \
imContentSink.jsm \
imServices.jsm \
imSmileys.jsm \
imStatusUtils.jsm \
@@ -24,14 +25,9 @@ ifndef MOZ_THUNDERBIRD
EXTRA_JS_MODULES += http.jsm
endif
EXTRA_PP_JS_MODULES = \
hiddenWindow.jsm \
imTextboxUtils.jsm \
$(NULL)
-ifdef ENABLE_TESTS
-relativesrcdir = @relativesrcdir@
-XPCSHELL_TESTS = test
-endif
-
include $(topsrcdir)/config/rules.mk
--- a/chat/modules/moz.build
+++ b/chat/modules/moz.build
@@ -1,4 +1,7 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell.ini']
+
--- a/chat/protocols/irc/Makefile.in
+++ b/chat/protocols/irc/Makefile.in
@@ -1,16 +1,17 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
+relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
EXTRA_COMPONENTS = \
irc.js \
irc.manifest \
$(NULL)
@@ -25,14 +26,9 @@ EXTRA_JS_MODULES = \
ircMultiPrefix.jsm \
ircNonStandard.jsm \
ircSASL.jsm \
ircServices.jsm \
ircUtils.jsm \
ircWatchMonitor.jsm \
$(NULL)
-ifdef ENABLE_TESTS
-relativesrcdir = @relativesrcdir@
-XPCSHELL_TESTS = test
-endif
-
include $(topsrcdir)/config/rules.mk
--- a/chat/protocols/irc/moz.build
+++ b/chat/protocols/irc/moz.build
@@ -1,4 +1,6 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell.ini']
--- a/ldap/xpcom/tests/Makefile.in
+++ b/ldap/xpcom/tests/Makefile.in
@@ -6,11 +6,9 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
-XPCSHELL_TESTS = unit
-
include $(topsrcdir)/config/rules.mk
--- a/ldap/xpcom/tests/moz.build
+++ b/ldap/xpcom/tests/moz.build
@@ -1,4 +1,7 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
--- a/mail/base/test/Makefile.in
+++ b/mail/base/test/Makefile.in
@@ -6,11 +6,9 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
-XPCSHELL_TESTS = unit
-
include $(topsrcdir)/config/rules.mk
--- a/mail/base/test/moz.build
+++ b/mail/base/test/moz.build
@@ -1,4 +1,7 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
--- a/mail/components/test/Makefile.in
+++ b/mail/components/test/Makefile.in
@@ -6,11 +6,9 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
-XPCSHELL_TESTS = unit
-
include $(topsrcdir)/config/rules.mk
--- a/mail/components/test/moz.build
+++ b/mail/components/test/moz.build
@@ -1,4 +1,7 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
--- a/mail/steel/Makefile.in
+++ b/mail/steel/Makefile.in
@@ -8,16 +8,9 @@ srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
EXTRA_COMPONENTS = steelApplication.manifest
EXTRA_PP_COMPONENTS = steelApplication.js
-ifdef ENABLE_TESTS
-XPCSHELL_TESTS = test
-
-# Uncomment this when we need it for more general tests.
-#XPCSHELL_TESTS += unit
-endif
-
include $(topsrcdir)/config/rules.mk
--- a/mail/steel/moz.build
+++ b/mail/steel/moz.build
@@ -4,8 +4,10 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
XPIDL_SOURCES += [
'steelIApplication.idl',
]
XPIDL_MODULE = 'steel'
+XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell.ini']
+
--- a/mailnews/addrbook/test/Makefile.in
+++ b/mailnews/addrbook/test/Makefile.in
@@ -6,12 +6,10 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
-XPCSHELL_TESTS = unit
-
include $(topsrcdir)/config/rules.mk
--- a/mailnews/addrbook/test/moz.build
+++ b/mailnews/addrbook/test/moz.build
@@ -1,4 +1,7 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
--- a/mailnews/base/test/Makefile.in
+++ b/mailnews/base/test/Makefile.in
@@ -8,18 +8,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
-XPCSHELL_TESTS = unit
-
CPP_UNIT_TESTS = \
TestMailCookie.cpp \
$(NULL)
include $(topsrcdir)/config/rules.mk
LOCAL_INCLUDES = \
-I$(MOZILLA_SRCDIR)/xpcom/tests \
--- a/mailnews/base/test/moz.build
+++ b/mailnews/base/test/moz.build
@@ -1,4 +1,7 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
--- a/mailnews/compose/test/Makefile.in
+++ b/mailnews/compose/test/Makefile.in
@@ -6,12 +6,10 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
-XPCSHELL_TESTS = unit
-
include $(topsrcdir)/config/rules.mk
--- a/mailnews/compose/test/moz.build
+++ b/mailnews/compose/test/moz.build
@@ -1,4 +1,7 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
--- a/mailnews/db/gloda/test/Makefile.in
+++ b/mailnews/db/gloda/test/Makefile.in
@@ -6,11 +6,9 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
-XPCSHELL_TESTS = unit
-
include $(topsrcdir)/config/rules.mk
--- a/mailnews/db/gloda/test/moz.build
+++ b/mailnews/db/gloda/test/moz.build
@@ -1,4 +1,7 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
--- a/mailnews/db/msgdb/test/Makefile.in
+++ b/mailnews/db/msgdb/test/Makefile.in
@@ -6,11 +6,9 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
-XPCSHELL_TESTS = unit
-
include $(topsrcdir)/config/rules.mk
--- a/mailnews/db/msgdb/test/moz.build
+++ b/mailnews/db/msgdb/test/moz.build
@@ -1,4 +1,7 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
--- a/mailnews/extensions/bayesian-spam-filter/test/Makefile.in
+++ b/mailnews/extensions/bayesian-spam-filter/test/Makefile.in
@@ -4,13 +4,11 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
-XPCSHELL_TESTS = unit
-
include $(topsrcdir)/config/rules.mk
--- a/mailnews/extensions/bayesian-spam-filter/test/moz.build
+++ b/mailnews/extensions/bayesian-spam-filter/test/moz.build
@@ -1,4 +1,7 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
--- a/mailnews/extensions/mdn/test/Makefile.in
+++ b/mailnews/extensions/mdn/test/Makefile.in
@@ -4,13 +4,11 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
-XPCSHELL_TESTS = unit
-
include $(topsrcdir)/config/rules.mk
--- a/mailnews/extensions/mdn/test/moz.build
+++ b/mailnews/extensions/mdn/test/moz.build
@@ -1,4 +1,7 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
--- a/mailnews/imap/test/Makefile.in
+++ b/mailnews/imap/test/Makefile.in
@@ -8,18 +8,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
-XPCSHELL_TESTS = unit
-
include $(topsrcdir)/config/rules.mk
LOCAL_INCLUDES = \
-I$(MOZILLA_SRCDIR)/xpcom/tests \
-I$(topsrcdir)/mailnews/base/util \
-I$(srcdir)/../src \
$(NULL)
--- a/mailnews/imap/test/moz.build
+++ b/mailnews/imap/test/moz.build
@@ -1,4 +1,7 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
--- a/mailnews/import/test/Makefile.in
+++ b/mailnews/import/test/Makefile.in
@@ -6,12 +6,10 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
-XPCSHELL_TESTS = unit
-
include $(topsrcdir)/config/rules.mk
--- a/mailnews/import/test/moz.build
+++ b/mailnews/import/test/moz.build
@@ -1,4 +1,7 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
--- a/mailnews/local/test/Makefile.in
+++ b/mailnews/local/test/Makefile.in
@@ -6,11 +6,9 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
-XPCSHELL_TESTS = unit
-
include $(topsrcdir)/config/rules.mk
--- a/mailnews/local/test/moz.build
+++ b/mailnews/local/test/moz.build
@@ -1,4 +1,7 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
--- a/mailnews/mime/test/Makefile.in
+++ b/mailnews/mime/test/Makefile.in
@@ -6,12 +6,10 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
-XPCSHELL_TESTS = unit
-
include $(topsrcdir)/config/rules.mk
--- a/mailnews/mime/test/moz.build
+++ b/mailnews/mime/test/moz.build
@@ -1,4 +1,7 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
--- a/mailnews/news/test/Makefile.in
+++ b/mailnews/news/test/Makefile.in
@@ -6,12 +6,10 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
-XPCSHELL_TESTS = unit
-
include $(topsrcdir)/config/rules.mk
--- a/mailnews/news/test/moz.build
+++ b/mailnews/news/test/moz.build
@@ -1,4 +1,7 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
--- a/suite/common/places/tests/Makefile.in
+++ b/suite/common/places/tests/Makefile.in
@@ -6,18 +6,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
-XPCSHELL_TESTS = unit
-
include $(topsrcdir)/config/rules.mk
_CHROME_FILES = \
head.js \
test_treeview_date.xul \
test_bug485100-change-case-loses-tag.xul \
test_bug427633_no_newfolder_if_noip.xul \
test_0_multiple_left_pane.xul \
--- a/suite/common/places/tests/moz.build
+++ b/suite/common/places/tests/moz.build
@@ -1,4 +1,7 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
--- a/suite/modules/test/Makefile.in
+++ b/suite/modules/test/Makefile.in
@@ -5,11 +5,9 @@
DEPTH = @DEPTH@
VPATH = @srcdir@
srcdir = @srcdir@
topsrcdir = @top_srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
-XPCSHELL_TESTS = unit
-
include $(topsrcdir)/config/rules.mk
--- a/suite/modules/test/moz.build
+++ b/suite/modules/test/moz.build
@@ -1,4 +1,7 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+