Bug 593855 - Part 5, remove MODULES from makefiles that don't need it. r=KaiRo
(Port |
Bug 586754 Xpcshell tests should use relativesrcdir instead of $MODULE| to comm-central)
--- a/calendar/test/Makefile.in
+++ b/calendar/test/Makefile.in
@@ -40,13 +40,11 @@
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = calendar/test
include $(DEPTH)/config/autoconf.mk
-MODULE = test_calendar
-
XPCSHELL_TESTS = unit
include $(topsrcdir)/config/rules.mk
--- a/directory/xpcom/tests/Makefile.in
+++ b/directory/xpcom/tests/Makefile.in
@@ -39,19 +39,16 @@
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = directory/xpcom/tests
include $(DEPTH)/config/autoconf.mk
-# Module name for xpcshell tests.
-MODULE = test_ldapxpcom
-
XPCSHELL_TESTS = unit
include $(topsrcdir)/config/rules.mk
# Note that for the time being "ldapshell" requires LDAP Experimental
#
ifdef MOZ_LDAP_XPCOM_EXPERIMENTAL
--- a/mail/base/test/Makefile.in
+++ b/mail/base/test/Makefile.in
@@ -39,14 +39,11 @@
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = mail/base/test
include $(DEPTH)/config/autoconf.mk
-# Module name for xpcshell tests.
-MODULE = test_mailbase
-
XPCSHELL_TESTS = unit
include $(topsrcdir)/config/rules.mk
--- a/mail/steel/Makefile.in
+++ b/mail/steel/Makefile.in
@@ -39,17 +39,16 @@
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = mail/steel
include $(DEPTH)/config/autoconf.mk
-MODULE = steel
XPIDL_MODULE = steel
XPIDLSRCS = steelIApplication.idl
EXTRA_PP_COMPONENTS = steelApplication.js \
steelApplication.manifest
ifdef ENABLE_TESTS
--- a/mailnews/addrbook/test/Makefile.in
+++ b/mailnews/addrbook/test/Makefile.in
@@ -39,15 +39,12 @@
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = mailnews/addrbook/test
include $(DEPTH)/config/autoconf.mk
-# Module name for xpcshell tests.
-MODULE = test_addbook
-
XPCSHELL_TESTS = unit
include $(topsrcdir)/config/rules.mk
--- a/mailnews/base/test/Makefile.in
+++ b/mailnews/base/test/Makefile.in
@@ -40,19 +40,16 @@
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = mailnews/base/test
include $(DEPTH)/config/autoconf.mk
-# Module name for xpcshell tests.
-MODULE = test_mailnewsbase
-
ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
MOZILLA_INTERNAL_API = 1
endif
CPP_UNIT_TESTS = \
TestMsgStripRE.cpp \
$(NULL)
--- a/mailnews/compose/test/Makefile.in
+++ b/mailnews/compose/test/Makefile.in
@@ -39,15 +39,12 @@
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = mailnews/compose/test
include $(DEPTH)/config/autoconf.mk
-# Module name for xpcshell tests.
-MODULE = test_compose
-
XPCSHELL_TESTS = unit
include $(topsrcdir)/config/rules.mk
--- a/mailnews/db/gloda/test/Makefile.in
+++ b/mailnews/db/gloda/test/Makefile.in
@@ -39,14 +39,11 @@
DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = mailnews/db/gloda/test
include $(DEPTH)/config/autoconf.mk
-# Module name for xpcshell tests.
-MODULE = test_mailnewsglobaldb
-
XPCSHELL_TESTS = unit
include $(topsrcdir)/config/rules.mk
--- a/mailnews/db/msgdb/test/Makefile.in
+++ b/mailnews/db/msgdb/test/Makefile.in
@@ -39,14 +39,11 @@
DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = mailnews/db/msgdb/test
include $(DEPTH)/config/autoconf.mk
-# Module name for xpcshell tests.
-MODULE = test_mailnewsdb
-
XPCSHELL_TESTS = unit
include $(topsrcdir)/config/rules.mk
--- a/mailnews/extensions/bayesian-spam-filter/test/Makefile.in
+++ b/mailnews/extensions/bayesian-spam-filter/test/Makefile.in
@@ -37,16 +37,13 @@
DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = mailnews/extensions/bayesian-spam-filter/test
include $(DEPTH)/config/autoconf.mk
-# Module name for xpcshell tests.
-MODULE = test_bayes
-
XPCSHELL_TESTS = unit
include $(topsrcdir)/config/rules.mk
--- a/mailnews/extensions/mdn/test/Makefile.in
+++ b/mailnews/extensions/mdn/test/Makefile.in
@@ -37,16 +37,13 @@
DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = mailnews/extensions/mdn/test
include $(DEPTH)/config/autoconf.mk
-# Module name for xpcshell tests.
-MODULE = test_mdn
-
XPCSHELL_TESTS = unit
include $(topsrcdir)/config/rules.mk
--- a/mailnews/imap/test/Makefile.in
+++ b/mailnews/imap/test/Makefile.in
@@ -40,24 +40,20 @@
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = mailnews/imap/test
include $(DEPTH)/config/autoconf.mk
-# Module name for xpcshell tests.
-MODULE = test_imap
-
ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
MOZILLA_INTERNAL_API = 1
endif
-
CPP_UNIT_TESTS = \
TestImapHdrXferInfo.cpp \
TestImapFlagAndUidState.cpp \
$(NULL)
include $(topsrcdir)/config/config.mk
XPCSHELL_TESTS = unit
--- a/mailnews/import/test/Makefile.in
+++ b/mailnews/import/test/Makefile.in
@@ -39,15 +39,12 @@
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = mailnews/import/test
include $(DEPTH)/config/autoconf.mk
-# Module name for xpcshell tests.
-MODULE = test_import
-
XPCSHELL_TESTS = unit
include $(topsrcdir)/config/rules.mk
--- a/mailnews/local/test/Makefile.in
+++ b/mailnews/local/test/Makefile.in
@@ -39,14 +39,11 @@
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = mailnews/local/test
include $(DEPTH)/config/autoconf.mk
-# Module name for xpcshell tests.
-MODULE = test_mailnewslocal
-
XPCSHELL_TESTS = unit
include $(topsrcdir)/config/rules.mk
--- a/mailnews/mime/test/Makefile.in
+++ b/mailnews/mime/test/Makefile.in
@@ -39,15 +39,12 @@
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = mailnews/mime/test
include $(DEPTH)/config/autoconf.mk
-# Module name for xpcshell tests.
-MODULE = test_mime
-
XPCSHELL_TESTS = unit
include $(topsrcdir)/config/rules.mk
--- a/mailnews/news/test/Makefile.in
+++ b/mailnews/news/test/Makefile.in
@@ -39,15 +39,12 @@
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = mailnews/news/test
include $(DEPTH)/config/autoconf.mk
-# Module name for xpcshell tests.
-MODULE = test_news
-
XPCSHELL_TESTS = unit
include $(topsrcdir)/config/rules.mk
--- a/suite/common/places/tests/Makefile.in
+++ b/suite/common/places/tests/Makefile.in
@@ -40,17 +40,16 @@
DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = suite/common/places/tests
include $(DEPTH)/config/autoconf.mk
-MODULE = test_suite_places
XPCSHELL_TESTS = unit
include $(topsrcdir)/config/rules.mk
_CHROME_FILES = \
test_treeview_date.xul \
test_bug485100-change-case-loses-tag.xul \
test_bug427633_no_newfolder_if_noip.xul \