From 9c7dfb9706e919ff0cb345e1cc6e1616bf22813c Mon Sep 17 00:00:00 2001 From: Panagiotis Koutsourakis Date: Sat, 4 Feb 2012 17:32:24 +0000 Subject: [PATCH] Bug 702388 - Convert Makefiles to use |TEST_DIRS += foo| r=khuey Files named Makefile.in containing the expression DIRS += or DIRS = inside the conditional expression ifdef ENABLE_TESTS ... endif are changed to TEST_DIRS += tests outside any conditional expression. The files ./layout/Makefile.in ./layout/Makefile.in ./layout/style/Makefile.in ./rdf/Makefile.in ./security/manager/Makefile.in ./content/Makefile.in ./content/smil/Makefile.in ./content/xul/templates/Makefile.in ./content/xul/content/Makefile.in ./content/base/Makefile.in ./content/media/Makefile.in ./parser/htmlparser/Makefile.in ./dom/sms/Makefile.in ./js/jsd/Makefile.in ./js/xpconnect/Makefile.in ./widget/Makefile.in ./widget/windows/Makefile.in ./Makefile.in ./startupcache/Makefile.in ./storage/Makefile.in ./gfx/Makefile.in ./intl/strres/Makefile.in ./intl/uconv/Makefile.in ./intl/unicharutil/Makefile.in ./intl/lwbrk/Makefile.in ./embedding/Makefile.in ./modules/libjar/Makefile.in ./modules/libpref/Makefile.in ./build/Makefile.in ./build/win32/Makefile.in ./xpcom/Makefile.in ./extensions/spellcheck/hunspell/Makefile.in ./extensions/cookie/Makefile.in ./netwerk/Makefile.in ./netwerk/streamconv/Makefile.in ./editor/txmgr/Makefile.in ./toolkit/mozapps/shared/Makefile.in ./toolkit/mozapps/update/Makefile.in ./toolkit/library/Makefile.in ./toolkit/library/Makefile.in ./toolkit/crashreporter/Makefile.in ./toolkit/components/perf/Makefile.in ./toolkit/components/perf/Makefile.in ./toolkit/components/feeds/Makefile.in ./toolkit/components/url-classifier/Makefile.in contain the string ifdef ENABLE_TESTS but have some other statement inside (e.g. TOOL_DIRS += etc) and they remain unchanged by this patch. --- accessible/Makefile.in | 4 +--- browser/base/Makefile.in | 4 +--- browser/components/certerror/Makefile.in | 4 +--- browser/components/dirprovider/Makefile.in | 4 +--- browser/components/feeds/Makefile.in | 4 +--- browser/components/places/Makefile.in | 4 +--- browser/components/preferences/Makefile.in | 4 +--- browser/components/privatebrowsing/Makefile.in | 4 +--- browser/components/safebrowsing/Makefile.in | 4 +--- browser/components/search/Makefile.in | 4 +--- browser/components/shell/Makefile.in | 4 +--- browser/components/tabview/Makefile.in | 4 +--- browser/devtools/highlighter/Makefile.in | 4 +--- browser/devtools/scratchpad/Makefile.in | 4 +--- browser/devtools/shared/Makefile.in | 4 +--- browser/devtools/sourceeditor/Makefile.in | 4 +--- browser/devtools/styleeditor/Makefile.in | 4 +--- browser/devtools/tilt/Makefile.in | 4 +--- browser/fuel/Makefile.in | 4 +--- browser/modules/Makefile.in | 4 +--- build/Makefile.in | 6 ++---- caps/Makefile.in | 4 +--- chrome/Makefile.in | 4 +--- content/canvas/Makefile.in | 4 +--- content/events/Makefile.in | 4 +--- content/html/content/Makefile.in | 4 +--- content/html/content/test/Makefile.in | 6 ++---- content/html/document/Makefile.in | 4 +--- content/svg/content/Makefile.in | 4 +--- content/xbl/Makefile.in | 4 +--- content/xml/document/Makefile.in | 4 +--- content/xslt/Makefile.in | 6 ++---- content/xtf/Makefile.in | 4 +--- content/xul/document/Makefile.in | 4 +--- docshell/Makefile.in | 4 +--- dom/Makefile.in | 6 ++---- dom/battery/Makefile.in | 4 +--- dom/indexedDB/Makefile.in | 4 +--- dom/ipc/Makefile.in | 4 +--- dom/network/Makefile.in | 4 +--- dom/plugins/test/Makefile.in | 4 +--- dom/src/Makefile.in | 4 +--- dom/src/json/Makefile.in | 4 +--- dom/src/jsurl/Makefile.in | 4 +--- dom/workers/Makefile.in | 4 +--- editor/composer/Makefile.in | 4 +--- editor/libeditor/base/Makefile.in | 4 +--- editor/libeditor/html/Makefile.in | 4 +--- editor/libeditor/text/Makefile.in | 4 +--- extensions/spellcheck/Makefile.in | 4 +--- extensions/universalchardet/Makefile.in | 4 +--- image/Makefile.in | 4 +--- intl/locale/Makefile.in | 4 +--- js/src/Makefile.in | 8 ++------ layout/base/Makefile.in | 4 +--- layout/forms/Makefile.in | 4 +--- layout/generic/Makefile.in | 4 +--- layout/tables/Makefile.in | 5 ++--- mobile/android/chrome/Makefile.in | 4 +--- mobile/xul/chrome/Makefile.in | 4 +--- modules/libjar/zipwriter/Makefile.in | 4 +--- parser/xml/Makefile.in | 4 +--- security/manager/ssl/Makefile.in | 4 +--- services/crypto/Makefile.in | 4 +--- services/crypto/component/Makefile.in | 4 +--- services/sync/Makefile.in | 4 +--- testing/xpcshell/Makefile.in | 4 +--- toolkit/components/alerts/Makefile.in | 4 +--- toolkit/components/autocomplete/Makefile.in | 4 +--- toolkit/components/commandlines/Makefile.in | 4 +--- toolkit/components/contentprefs/Makefile.in | 4 +--- toolkit/components/ctypes/Makefile.in | 4 +--- toolkit/components/downloads/Makefile.in | 4 +--- toolkit/components/microformats/Makefile.in | 4 +--- toolkit/components/passwordmgr/Makefile.in | 4 +--- toolkit/components/places/Makefile.in | 4 +--- toolkit/components/prompts/Makefile.in | 4 +--- toolkit/components/satchel/Makefile.in | 4 +--- toolkit/components/search/Makefile.in | 4 +--- toolkit/components/telemetry/Makefile.in | 4 +--- toolkit/components/urlformatter/Makefile.in | 4 +--- toolkit/components/viewsource/Makefile.in | 4 +--- toolkit/content/Makefile.in | 4 +--- toolkit/mozapps/downloads/Makefile.in | 4 +--- toolkit/mozapps/extensions/Makefile.in | 4 +--- toolkit/mozapps/plugins/Makefile.in | 4 +--- toolkit/profile/Makefile.in | 4 +--- toolkit/themes/pinstripe/Makefile.in | 4 +--- toolkit/xre/Makefile.in | 4 +--- uriloader/exthandler/Makefile.in | 4 +--- 90 files changed, 96 insertions(+), 277 deletions(-) diff --git a/accessible/Makefile.in b/accessible/Makefile.in index 21a5893b3500..634557084f40 100644 --- a/accessible/Makefile.in +++ b/accessible/Makefile.in @@ -45,9 +45,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = accessibility DIRS = public src build -ifdef ENABLE_TESTS -DIRS += tests -endif +TEST_DIRS += tests include $(topsrcdir)/config/rules.mk diff --git a/browser/base/Makefile.in b/browser/base/Makefile.in index af88ed7d0429..c8f856f3a2bf 100644 --- a/browser/base/Makefile.in +++ b/browser/base/Makefile.in @@ -49,9 +49,7 @@ abs_srcdir = $(call core_abspath,$(srcdir)) CHROME_DEPS += $(abs_srcdir)/content/overrides/app-license.html -ifdef ENABLE_TESTS -DIRS += content/test -endif +TEST_DIRS += content/test include $(topsrcdir)/config/rules.mk diff --git a/browser/components/certerror/Makefile.in b/browser/components/certerror/Makefile.in index a9217958a61b..43aef5003de0 100644 --- a/browser/components/certerror/Makefile.in +++ b/browser/components/certerror/Makefile.in @@ -43,8 +43,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/browser/components/dirprovider/Makefile.in b/browser/components/dirprovider/Makefile.in index e401ae301e1d..3ce4b8184f3f 100644 --- a/browser/components/dirprovider/Makefile.in +++ b/browser/components/dirprovider/Makefile.in @@ -45,9 +45,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = browserdir LIBRARY_NAME = browserdir_s -ifdef ENABLE_TESTS -DIRS = tests -endif +TEST_DIRS += tests FORCE_STATIC_LIB = 1 diff --git a/browser/components/feeds/Makefile.in b/browser/components/feeds/Makefile.in index 93681d67f15e..a4eaeb3c4c7a 100644 --- a/browser/components/feeds/Makefile.in +++ b/browser/components/feeds/Makefile.in @@ -43,8 +43,6 @@ include $(DEPTH)/config/autoconf.mk DIRS = public src -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/browser/components/places/Makefile.in b/browser/components/places/Makefile.in index 29306f554212..81a7ddc29616 100644 --- a/browser/components/places/Makefile.in +++ b/browser/components/places/Makefile.in @@ -45,9 +45,7 @@ include $(DEPTH)/config/autoconf.mk DIRS = src -ifdef ENABLE_TESTS - DIRS += tests -endif +TEST_DIRS += tests include $(topsrcdir)/config/rules.mk diff --git a/browser/components/preferences/Makefile.in b/browser/components/preferences/Makefile.in index cda73ceb7896..e3fe90492f24 100644 --- a/browser/components/preferences/Makefile.in +++ b/browser/components/preferences/Makefile.in @@ -43,9 +43,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -ifdef ENABLE_TESTS -DIRS += tests -endif +TEST_DIRS += tests include $(topsrcdir)/config/rules.mk diff --git a/browser/components/privatebrowsing/Makefile.in b/browser/components/privatebrowsing/Makefile.in index 4540affae78e..64058207d62d 100644 --- a/browser/components/privatebrowsing/Makefile.in +++ b/browser/components/privatebrowsing/Makefile.in @@ -46,8 +46,6 @@ MODULE = privatebrowsing DIRS = src -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/browser/components/safebrowsing/Makefile.in b/browser/components/safebrowsing/Makefile.in index 2d526c2933cc..38338147abc4 100644 --- a/browser/components/safebrowsing/Makefile.in +++ b/browser/components/safebrowsing/Makefile.in @@ -43,9 +43,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -ifdef ENABLE_TESTS -DIRS += content/test -endif +TEST_DIRS += content/test ifdef MOZILLA_OFFICIAL DEFINES += -DOFFICIAL_BUILD=1 diff --git a/browser/components/search/Makefile.in b/browser/components/search/Makefile.in index a2f7dfe3ab5a..8d4cebc0d771 100644 --- a/browser/components/search/Makefile.in +++ b/browser/components/search/Makefile.in @@ -43,8 +43,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -ifdef ENABLE_TESTS -DIRS = test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/browser/components/shell/Makefile.in b/browser/components/shell/Makefile.in index 7f3883694b0c..1f4c1ff7c871 100644 --- a/browser/components/shell/Makefile.in +++ b/browser/components/shell/Makefile.in @@ -44,8 +44,6 @@ include $(DEPTH)/config/autoconf.mk DIRS = public src -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/browser/components/tabview/Makefile.in b/browser/components/tabview/Makefile.in index c86fb752212d..2a266a8e684e 100644 --- a/browser/components/tabview/Makefile.in +++ b/browser/components/tabview/Makefile.in @@ -43,9 +43,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -ifdef ENABLE_TESTS - DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/browser/devtools/highlighter/Makefile.in b/browser/devtools/highlighter/Makefile.in index fbe321671b1b..258a055ab0d2 100644 --- a/browser/devtools/highlighter/Makefile.in +++ b/browser/devtools/highlighter/Makefile.in @@ -52,8 +52,6 @@ EXTRA_JS_MODULES = \ highlighter.jsm \ $(NULL) -ifdef ENABLE_TESTS - DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/browser/devtools/scratchpad/Makefile.in b/browser/devtools/scratchpad/Makefile.in index 376ffb1ef0cd..bd17c2d0dc1c 100644 --- a/browser/devtools/scratchpad/Makefile.in +++ b/browser/devtools/scratchpad/Makefile.in @@ -43,9 +43,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -ifdef ENABLE_TESTS - DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/browser/devtools/shared/Makefile.in b/browser/devtools/shared/Makefile.in index 074d954280ae..dea9f1cafd38 100644 --- a/browser/devtools/shared/Makefile.in +++ b/browser/devtools/shared/Makefile.in @@ -45,9 +45,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -ifdef ENABLE_TESTS - DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/browser/devtools/sourceeditor/Makefile.in b/browser/devtools/sourceeditor/Makefile.in index d8b36e80539f..a8e45d310f8e 100644 --- a/browser/devtools/sourceeditor/Makefile.in +++ b/browser/devtools/sourceeditor/Makefile.in @@ -44,9 +44,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -ifdef ENABLE_TESTS - DIRS += test -endif +TEST_DIRS += test EXTRA_JS_MODULES = \ source-editor.jsm \ diff --git a/browser/devtools/styleeditor/Makefile.in b/browser/devtools/styleeditor/Makefile.in index 5dc39453e206..77a89f998536 100644 --- a/browser/devtools/styleeditor/Makefile.in +++ b/browser/devtools/styleeditor/Makefile.in @@ -42,9 +42,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/browser/devtools/tilt/Makefile.in b/browser/devtools/tilt/Makefile.in index 60f934d0357d..0ae639ead1ce 100644 --- a/browser/devtools/tilt/Makefile.in +++ b/browser/devtools/tilt/Makefile.in @@ -42,9 +42,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -ifdef ENABLE_TESTS - DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/browser/fuel/Makefile.in b/browser/fuel/Makefile.in index 87f996957237..5930d116a0ac 100644 --- a/browser/fuel/Makefile.in +++ b/browser/fuel/Makefile.in @@ -44,9 +44,7 @@ include $(DEPTH)/config/autoconf.mk DIRS = public src -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/browser/modules/Makefile.in b/browser/modules/Makefile.in index 721d812c6e00..ba2063663abe 100644 --- a/browser/modules/Makefile.in +++ b/browser/modules/Makefile.in @@ -44,9 +44,7 @@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test EXTRA_JS_MODULES = \ openLocationLastURL.jsm \ diff --git a/build/Makefile.in b/build/Makefile.in index 46d0f9e3ef42..c521b7b8fd62 100644 --- a/build/Makefile.in +++ b/build/Makefile.in @@ -55,17 +55,15 @@ endif DIRS += pgo -ifdef ENABLE_TESTS - DIRS += autoconf/test +TEST_DIRS += autoconf/test ifeq (android,$(MOZ_WIDGET_TOOLKIT)) - DIRS += mobile/sutagent/android \ +TEST_DIRS += mobile/sutagent/android \ mobile/sutagent/android/watcher \ mobile/sutagent/android/ffxcp \ mobile/sutagent/android/fencp \ mobile/robocop \ $(NULL) endif -endif ifdef MOZ_APP_BASENAME DIST_FILES = application.ini diff --git a/caps/Makefile.in b/caps/Makefile.in index b89c840681c6..ffd06a035ee5 100644 --- a/caps/Makefile.in +++ b/caps/Makefile.in @@ -45,9 +45,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = caps DIRS = idl include src -ifdef ENABLE_TESTS -DIRS += tests/mochitest -endif +TEST_DIRS += tests/mochitest include $(topsrcdir)/config/rules.mk diff --git a/chrome/Makefile.in b/chrome/Makefile.in index bbb7c2303597..df7b442ff1f5 100644 --- a/chrome/Makefile.in +++ b/chrome/Makefile.in @@ -44,9 +44,7 @@ include $(DEPTH)/config/autoconf.mk DIRS = public src -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/content/canvas/Makefile.in b/content/canvas/Makefile.in index 520eb65e3e6c..c5d2bae2f4f8 100644 --- a/content/canvas/Makefile.in +++ b/content/canvas/Makefile.in @@ -45,9 +45,7 @@ include $(DEPTH)/config/autoconf.mk PARALLEL_DIRS = public src -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/content/events/Makefile.in b/content/events/Makefile.in index 9f8c14738d3a..d6d3818258e3 100644 --- a/content/events/Makefile.in +++ b/content/events/Makefile.in @@ -44,9 +44,7 @@ include $(DEPTH)/config/autoconf.mk PARALLEL_DIRS = public src -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/content/html/content/Makefile.in b/content/html/content/Makefile.in index 1eafc57044b7..fe9fac05f8e9 100644 --- a/content/html/content/Makefile.in +++ b/content/html/content/Makefile.in @@ -44,9 +44,7 @@ include $(DEPTH)/config/autoconf.mk PARALLEL_DIRS = public src -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/content/html/content/test/Makefile.in b/content/html/content/test/Makefile.in index 750103d0fffb..d540c2efca99 100644 --- a/content/html/content/test/Makefile.in +++ b/content/html/content/test/Makefile.in @@ -43,18 +43,16 @@ relativesrcdir = content/html/content/test include $(DEPTH)/config/autoconf.mk -ifdef ENABLE_TESTS # This extra subdirectory is needed due to the nature of this test. # With the bug, the test loads the base URL of the bug649134/file_*.sjs # files, and the mochitest server responds with the contents of index.html if # it exists in that case, which we use to detect failure. # We can't have index.html in this directory because it would prevent # running the tests here. -DIRS += bug649134 +TEST_DIRS += bug649134 # For form-related test suite. -DIRS += forms -endif +TEST_DIRS += forms include $(topsrcdir)/config/rules.mk diff --git a/content/html/document/Makefile.in b/content/html/document/Makefile.in index 1eafc57044b7..fe9fac05f8e9 100644 --- a/content/html/document/Makefile.in +++ b/content/html/document/Makefile.in @@ -44,9 +44,7 @@ include $(DEPTH)/config/autoconf.mk PARALLEL_DIRS = public src -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/content/svg/content/Makefile.in b/content/svg/content/Makefile.in index 13c6873a8a35..ce173f4d0311 100644 --- a/content/svg/content/Makefile.in +++ b/content/svg/content/Makefile.in @@ -45,9 +45,7 @@ include $(DEPTH)/config/autoconf.mk PARALLEL_DIRS = src -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/content/xbl/Makefile.in b/content/xbl/Makefile.in index 06cdaf1cf411..2d4f0bfa97b8 100644 --- a/content/xbl/Makefile.in +++ b/content/xbl/Makefile.in @@ -44,8 +44,6 @@ include $(DEPTH)/config/autoconf.mk PARALLEL_DIRS = public src builtin -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/content/xml/document/Makefile.in b/content/xml/document/Makefile.in index 48c4e3a825fd..db42d888c206 100644 --- a/content/xml/document/Makefile.in +++ b/content/xml/document/Makefile.in @@ -44,9 +44,7 @@ include $(DEPTH)/config/autoconf.mk PARALLEL_DIRS = public resources src -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/content/xslt/Makefile.in b/content/xslt/Makefile.in index 2a0596106921..76f8e043a123 100644 --- a/content/xslt/Makefile.in +++ b/content/xslt/Makefile.in @@ -44,9 +44,7 @@ include $(DEPTH)/config/autoconf.mk PARALLEL_DIRS = public src -ifdef ENABLE_TESTS -DIRS += tests/buster \ - tests/mochitest -endif +TEST_DIRS += tests/buster \ + tests/mochitest include $(topsrcdir)/config/rules.mk diff --git a/content/xtf/Makefile.in b/content/xtf/Makefile.in index ed835ae9fdf9..b47928937cbb 100644 --- a/content/xtf/Makefile.in +++ b/content/xtf/Makefile.in @@ -44,8 +44,6 @@ include $(DEPTH)/config/autoconf.mk PARALLEL_DIRS = public src -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/content/xul/document/Makefile.in b/content/xul/document/Makefile.in index a7b5499d4118..55b5656b77e8 100644 --- a/content/xul/document/Makefile.in +++ b/content/xul/document/Makefile.in @@ -45,9 +45,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = xuldoc PARALLEL_DIRS = public src -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/docshell/Makefile.in b/docshell/Makefile.in index 9fc325fd897a..5401fc059e32 100644 --- a/docshell/Makefile.in +++ b/docshell/Makefile.in @@ -51,8 +51,6 @@ DIRS = \ resources/content \ $(NULL) -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/dom/Makefile.in b/dom/Makefile.in index d0a56b35e18b..d082f8d51756 100644 --- a/dom/Makefile.in +++ b/dom/Makefile.in @@ -97,11 +97,9 @@ DIRS += \ $(NULL) endif -ifdef ENABLE_TESTS -DIRS += tests +TEST_DIRS += tests ifneq (,$(filter gtk2 cocoa windows android qt os2,$(MOZ_WIDGET_TOOLKIT))) -DIRS += plugins/test -endif +TEST_DIRS += plugins/test endif include $(topsrcdir)/config/rules.mk diff --git a/dom/battery/Makefile.in b/dom/battery/Makefile.in index a7b0e9c49fbb..6b84d89f259d 100644 --- a/dom/battery/Makefile.in +++ b/dom/battery/Makefile.in @@ -68,9 +68,7 @@ XPIDLSRCS = \ nsIDOMNavigatorBattery.idl \ $(NULL) -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/indexedDB/Makefile.in b/dom/indexedDB/Makefile.in index 2bf85c2db826..3cc2117aaceb 100644 --- a/dom/indexedDB/Makefile.in +++ b/dom/indexedDB/Makefile.in @@ -121,9 +121,7 @@ XPIDLSRCS = \ nsIIndexedDatabaseManager.idl \ $(NULL) -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/ipc/Makefile.in b/dom/ipc/Makefile.in index e6fe579fa8c1..de1986710e67 100644 --- a/dom/ipc/Makefile.in +++ b/dom/ipc/Makefile.in @@ -47,10 +47,8 @@ LIBXUL_LIBRARY = 1 FORCE_STATIC_LIB = 1 EXPORT_LIBRARY = 1 -ifdef ENABLE_TESTS ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -DIRS += tests -endif +TEST_DIRS += tests endif EXPORTS = TabMessageUtils.h PCOMContentPermissionRequestChild.h diff --git a/dom/network/Makefile.in b/dom/network/Makefile.in index 6fcb92991387..f2086072c797 100644 --- a/dom/network/Makefile.in +++ b/dom/network/Makefile.in @@ -43,8 +43,6 @@ include $(DEPTH)/config/autoconf.mk PARALLEL_DIRS = interfaces src -ifdef ENABLE_TESTS -DIRS += tests -endif +TEST_DIRS += tests include $(topsrcdir)/config/rules.mk diff --git a/dom/plugins/test/Makefile.in b/dom/plugins/test/Makefile.in index bbb390e3741d..b3887716c92d 100644 --- a/dom/plugins/test/Makefile.in +++ b/dom/plugins/test/Makefile.in @@ -53,9 +53,7 @@ XPCSHELL_TESTS = \ $(NULL) ifneq (,$(filter gtk2 cocoa windows,$(MOZ_WIDGET_TOOLKIT))) -ifdef ENABLE_TESTS -DIRS += mochitest -endif +TEST_DIRS += mochitest endif include $(topsrcdir)/config/rules.mk diff --git a/dom/src/Makefile.in b/dom/src/Makefile.in index 9b0a18f49e89..25cb38d828dc 100644 --- a/dom/src/Makefile.in +++ b/dom/src/Makefile.in @@ -44,8 +44,6 @@ include $(DEPTH)/config/autoconf.mk DIRS = jsurl events storage offline json geolocation notification -ifdef ENABLE_TESTS -DIRS += foo -endif +TEST_DIRS += foo include $(topsrcdir)/config/rules.mk diff --git a/dom/src/json/Makefile.in b/dom/src/json/Makefile.in index 611a727d1e01..8ec9c1d7ce8b 100644 --- a/dom/src/json/Makefile.in +++ b/dom/src/json/Makefile.in @@ -62,8 +62,6 @@ LOCAL_INCLUDES = \ DEFINES += -D_IMPL_NS_LAYOUT -ifdef ENABLE_TESTS - DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/dom/src/jsurl/Makefile.in b/dom/src/jsurl/Makefile.in index a4d100b1bc1f..10a6291dec36 100644 --- a/dom/src/jsurl/Makefile.in +++ b/dom/src/jsurl/Makefile.in @@ -68,9 +68,7 @@ DEFINES += -DDEBUG_GC endif DIRS = $(NULL) -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/dom/workers/Makefile.in b/dom/workers/Makefile.in index d4d0a8be34af..1b0e845cc0a9 100644 --- a/dom/workers/Makefile.in +++ b/dom/workers/Makefile.in @@ -80,8 +80,6 @@ LOCAL_INCLUDES = \ -I$(topsrcdir)/xpcom/build \ $(NULL) -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/editor/composer/Makefile.in b/editor/composer/Makefile.in index a3ce1aeddae7..80d12a00e35b 100644 --- a/editor/composer/Makefile.in +++ b/editor/composer/Makefile.in @@ -44,9 +44,7 @@ include $(DEPTH)/config/autoconf.mk DIRS = public src -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test # Enable Editor API Logging! ENABLE_EDITOR_API_LOG=1 diff --git a/editor/libeditor/base/Makefile.in b/editor/libeditor/base/Makefile.in index 66abeb19759c..8510224e2bef 100644 --- a/editor/libeditor/base/Makefile.in +++ b/editor/libeditor/base/Makefile.in @@ -43,9 +43,7 @@ FAIL_ON_WARNINGS = 1 include $(DEPTH)/config/autoconf.mk -ifdef ENABLE_TESTS -DIRS += tests -endif +TEST_DIRS += tests MODULE = editor LIBRARY_NAME = editorbase_s diff --git a/editor/libeditor/html/Makefile.in b/editor/libeditor/html/Makefile.in index cb1e68884dc4..cd9955155709 100644 --- a/editor/libeditor/html/Makefile.in +++ b/editor/libeditor/html/Makefile.in @@ -43,9 +43,7 @@ FAIL_ON_WARNINGS = 1 include $(DEPTH)/config/autoconf.mk -ifdef ENABLE_TESTS -DIRS += tests -endif +TEST_DIRS += tests MODULE = editor LIBRARY_NAME = htmleditor_s diff --git a/editor/libeditor/text/Makefile.in b/editor/libeditor/text/Makefile.in index 135898009bb3..bf3378c77422 100644 --- a/editor/libeditor/text/Makefile.in +++ b/editor/libeditor/text/Makefile.in @@ -43,9 +43,7 @@ FAIL_ON_WARNINGS = 1 include $(DEPTH)/config/autoconf.mk -ifdef ENABLE_TESTS -DIRS += tests -endif +TEST_DIRS += tests MODULE = editor LIBRARY_NAME = texteditor_s diff --git a/extensions/spellcheck/Makefile.in b/extensions/spellcheck/Makefile.in index 934660dcfc33..1feef2e04914 100644 --- a/extensions/spellcheck/Makefile.in +++ b/extensions/spellcheck/Makefile.in @@ -44,8 +44,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = spellchecker DIRS = idl locales hunspell src -ifdef ENABLE_TESTS -DIRS += tests/chrome -endif +TEST_DIRS += tests/chrome include $(topsrcdir)/config/rules.mk diff --git a/extensions/universalchardet/Makefile.in b/extensions/universalchardet/Makefile.in index 226eb661c56d..11616ba248ff 100644 --- a/extensions/universalchardet/Makefile.in +++ b/extensions/universalchardet/Makefile.in @@ -45,9 +45,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = universalchardet DIRS = src -ifdef ENABLE_TESTS -DIRS += tests -endif +TEST_DIRS += tests include $(topsrcdir)/config/rules.mk diff --git a/image/Makefile.in b/image/Makefile.in index 54fe7063d859..15d963b10eca 100644 --- a/image/Makefile.in +++ b/image/Makefile.in @@ -46,9 +46,7 @@ MODULE = imglib2 PARALLEL_DIRS = public src decoders encoders -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test DIRS += build diff --git a/intl/locale/Makefile.in b/intl/locale/Makefile.in index 0d611b5fa602..15d291b8d38a 100644 --- a/intl/locale/Makefile.in +++ b/intl/locale/Makefile.in @@ -47,9 +47,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = locale DIRS = public idl src -ifdef ENABLE_TESTS -DIRS += tests -endif +TEST_DIRS += tests include $(topsrcdir)/config/rules.mk diff --git a/js/src/Makefile.in b/js/src/Makefile.in index 204e9525e747..14ba6caf7140 100644 --- a/js/src/Makefile.in +++ b/js/src/Makefile.in @@ -61,14 +61,10 @@ endif # FIXME: bug 530688 covers getting these working on Android ifneq ($(OS_ARCH),ANDROID) -ifdef ENABLE_TESTS -DIRS += jsapi-tests -endif +TEST_DIRS += jsapi-tests endif -ifdef ENABLE_TESTS -DIRS += tests -endif +TEST_DIRS += tests MODULE = js LIBRARY_NAME = mozjs diff --git a/layout/base/Makefile.in b/layout/base/Makefile.in index 5534ecceb45a..33431a27f480 100644 --- a/layout/base/Makefile.in +++ b/layout/base/Makefile.in @@ -42,9 +42,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -ifdef ENABLE_TESTS -DIRS += tests -endif +TEST_DIRS += tests MODULE = layout XPIDL_MODULE = layout_base diff --git a/layout/forms/Makefile.in b/layout/forms/Makefile.in index ef73a56765e2..9b3550a7760c 100644 --- a/layout/forms/Makefile.in +++ b/layout/forms/Makefile.in @@ -44,9 +44,7 @@ include $(DEPTH)/config/autoconf.mk DIRS = $(NULL) -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test MODULE = layout XPIDL_MODULE = layout_forms diff --git a/layout/generic/Makefile.in b/layout/generic/Makefile.in index aa81c77c93b2..a733734d650b 100644 --- a/layout/generic/Makefile.in +++ b/layout/generic/Makefile.in @@ -41,9 +41,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test MODULE = layout LIBRARY_NAME = gkgeneric_s diff --git a/layout/tables/Makefile.in b/layout/tables/Makefile.in index 220b5e27acd2..36c1de1a01d1 100644 --- a/layout/tables/Makefile.in +++ b/layout/tables/Makefile.in @@ -72,9 +72,8 @@ CPPSRCS = \ # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 -ifdef ENABLE_TESTS -DIRS = test -endif +TEST_DIRS += test + include $(topsrcdir)/config/rules.mk diff --git a/mobile/android/chrome/Makefile.in b/mobile/android/chrome/Makefile.in index ca93fec14b66..599b5b42668d 100644 --- a/mobile/android/chrome/Makefile.in +++ b/mobile/android/chrome/Makefile.in @@ -48,8 +48,6 @@ DEFINES += -DAB_CD=$(MOZ_UI_LOCALE) \ $(NULL) -ifdef ENABLE_TESTS -DIRS += tests -endif +TEST_DIRS += tests include $(topsrcdir)/config/rules.mk diff --git a/mobile/xul/chrome/Makefile.in b/mobile/xul/chrome/Makefile.in index ca93fec14b66..599b5b42668d 100644 --- a/mobile/xul/chrome/Makefile.in +++ b/mobile/xul/chrome/Makefile.in @@ -48,8 +48,6 @@ DEFINES += -DAB_CD=$(MOZ_UI_LOCALE) \ $(NULL) -ifdef ENABLE_TESTS -DIRS += tests -endif +TEST_DIRS += tests include $(topsrcdir)/config/rules.mk diff --git a/modules/libjar/zipwriter/Makefile.in b/modules/libjar/zipwriter/Makefile.in index ec852fd20126..a6f0bd52717f 100644 --- a/modules/libjar/zipwriter/Makefile.in +++ b/modules/libjar/zipwriter/Makefile.in @@ -46,8 +46,6 @@ MODULE = zipwriter DIRS = public src -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/parser/xml/Makefile.in b/parser/xml/Makefile.in index 68aef738e857..0d1bdff55c98 100644 --- a/parser/xml/Makefile.in +++ b/parser/xml/Makefile.in @@ -43,8 +43,6 @@ include $(DEPTH)/config/autoconf.mk DIRS = public src -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/security/manager/ssl/Makefile.in b/security/manager/ssl/Makefile.in index 4ffcc43f58b1..e9db54d7d5c6 100644 --- a/security/manager/ssl/Makefile.in +++ b/security/manager/ssl/Makefile.in @@ -46,8 +46,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = pipnss DIRS = src public -ifdef ENABLE_TESTS -DIRS += tests -endif +TEST_DIRS += tests include $(topsrcdir)/config/rules.mk diff --git a/services/crypto/Makefile.in b/services/crypto/Makefile.in index e9a04c76a819..2796fb2ef9ed 100644 --- a/services/crypto/Makefile.in +++ b/services/crypto/Makefile.in @@ -48,8 +48,6 @@ MODULE = services-crypto libs:: $(PYTHON) $(topsrcdir)/config/nsinstall.py $(srcdir)/modules/* $(FINAL_TARGET)/modules/services-crypto -ifdef ENABLE_TESTS -DIRS += tests -endif +TEST_DIRS += tests include $(topsrcdir)/config/rules.mk diff --git a/services/crypto/component/Makefile.in b/services/crypto/component/Makefile.in index 12184a28834e..ebc5b458573f 100644 --- a/services/crypto/component/Makefile.in +++ b/services/crypto/component/Makefile.in @@ -63,8 +63,6 @@ CPPSRCS = \ nsSyncJPAKE.cpp \ $(NULL) -ifdef ENABLE_TESTS -DIRS += tests -endif +TEST_DIRS += tests include $(topsrcdir)/config/rules.mk diff --git a/services/sync/Makefile.in b/services/sync/Makefile.in index 53eba58e1b6b..7d7f74514792 100644 --- a/services/sync/Makefile.in +++ b/services/sync/Makefile.in @@ -86,8 +86,6 @@ ifndef NO_DIST_INSTALL endif -ifdef ENABLE_TESTS -DIRS += tests -endif +TEST_DIRS += tests include $(topsrcdir)/config/rules.mk diff --git a/testing/xpcshell/Makefile.in b/testing/xpcshell/Makefile.in index d1a37405526e..ee6ce20b63a0 100644 --- a/testing/xpcshell/Makefile.in +++ b/testing/xpcshell/Makefile.in @@ -47,9 +47,7 @@ MODULE = testing_xpcshell # Here's how you let the build system know there are tests in the # "example" folder: -ifdef ENABLE_TESTS -DIRS += example -endif +TEST_DIRS += example include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/alerts/Makefile.in b/toolkit/components/alerts/Makefile.in index f8f5624379ca..1c9330d2ccd9 100644 --- a/toolkit/components/alerts/Makefile.in +++ b/toolkit/components/alerts/Makefile.in @@ -65,9 +65,7 @@ DIRS += \ $(NULL) endif -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),windows gtk2 qt android)) include $(topsrcdir)/config/config.mk diff --git a/toolkit/components/autocomplete/Makefile.in b/toolkit/components/autocomplete/Makefile.in index e45a9e1b1323..22987839870a 100644 --- a/toolkit/components/autocomplete/Makefile.in +++ b/toolkit/components/autocomplete/Makefile.in @@ -64,8 +64,6 @@ CPPSRCS = \ nsAutoCompleteSimpleResult.cpp \ $(NULL) -ifdef ENABLE_TESTS -DIRS += tests -endif +TEST_DIRS += tests include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/commandlines/Makefile.in b/toolkit/components/commandlines/Makefile.in index 51970b5ff183..c6c49e65aa99 100644 --- a/toolkit/components/commandlines/Makefile.in +++ b/toolkit/components/commandlines/Makefile.in @@ -62,8 +62,6 @@ CPPSRCS = \ nsCommandLine.cpp \ $(NULL) -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/contentprefs/Makefile.in b/toolkit/components/contentprefs/Makefile.in index 8f5ac43c9808..a679b53ebf9b 100644 --- a/toolkit/components/contentprefs/Makefile.in +++ b/toolkit/components/contentprefs/Makefile.in @@ -45,8 +45,6 @@ MODULE = contentprefs EXTRA_COMPONENTS = nsContentPrefService.js nsContentPrefService.manifest -ifdef ENABLE_TESTS -DIRS += tests -endif +TEST_DIRS += tests include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/ctypes/Makefile.in b/toolkit/components/ctypes/Makefile.in index 89a8924e80ba..b5d20c061cc9 100644 --- a/toolkit/components/ctypes/Makefile.in +++ b/toolkit/components/ctypes/Makefile.in @@ -60,8 +60,6 @@ CPPSRCS = \ ctypes.cpp \ $(NULL) -ifdef ENABLE_TESTS -DIRS += tests -endif +TEST_DIRS += tests include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in index 5620a19d9419..3915016a29a7 100644 --- a/toolkit/components/downloads/Makefile.in +++ b/toolkit/components/downloads/Makefile.in @@ -75,8 +75,6 @@ EXTRA_COMPONENTS = \ $(NULL) endif -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/microformats/Makefile.in b/toolkit/components/microformats/Makefile.in index 756af0ce133b..aa00396b0df9 100644 --- a/toolkit/components/microformats/Makefile.in +++ b/toolkit/components/microformats/Makefile.in @@ -45,8 +45,6 @@ MODULE = microformats EXTRA_JS_MODULES = Microformats.js -ifdef ENABLE_TESTS -DIRS += tests -endif +TEST_DIRS += tests include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/passwordmgr/Makefile.in b/toolkit/components/passwordmgr/Makefile.in index 583f91867131..2e021333ef98 100644 --- a/toolkit/components/passwordmgr/Makefile.in +++ b/toolkit/components/passwordmgr/Makefile.in @@ -65,8 +65,6 @@ EXTRA_COMPONENTS = \ storage-mozStorage.js \ $(NULL) -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/places/Makefile.in b/toolkit/components/places/Makefile.in index fd385c689314..0235027184c0 100644 --- a/toolkit/components/places/Makefile.in +++ b/toolkit/components/places/Makefile.in @@ -128,9 +128,7 @@ EXTRA_PP_JS_MODULES = \ PlacesUtils.jsm \ $(NULL) -ifdef ENABLE_TESTS -DIRS += tests -endif +TEST_DIRS += tests include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/toolkit/components/prompts/Makefile.in b/toolkit/components/prompts/Makefile.in index 3cad06daefb8..c321a3912a5c 100644 --- a/toolkit/components/prompts/Makefile.in +++ b/toolkit/components/prompts/Makefile.in @@ -43,8 +43,6 @@ include $(DEPTH)/config/autoconf.mk DIRS = src -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/satchel/Makefile.in b/toolkit/components/satchel/Makefile.in index 2c6ac5eb471d..5a8256b0d1d9 100644 --- a/toolkit/components/satchel/Makefile.in +++ b/toolkit/components/satchel/Makefile.in @@ -76,8 +76,6 @@ EXTRA_JS_MODULES = \ nsFormAutoCompleteResult.jsm \ $(NULL) -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/search/Makefile.in b/toolkit/components/search/Makefile.in index d89bda16f83d..1275e807cfba 100644 --- a/toolkit/components/search/Makefile.in +++ b/toolkit/components/search/Makefile.in @@ -49,8 +49,6 @@ EXTRA_PP_COMPONENTS = nsSearchService.js \ DEFINES += -DMOZ_DISTRIBUTION_ID=$(MOZ_DISTRIBUTION_ID) -ifdef ENABLE_TESTS -DIRS += tests -endif +TEST_DIRS += tests include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/telemetry/Makefile.in b/toolkit/components/telemetry/Makefile.in index c0a8883c18e4..681601bfb803 100644 --- a/toolkit/components/telemetry/Makefile.in +++ b/toolkit/components/telemetry/Makefile.in @@ -79,9 +79,7 @@ EXTRA_DSO_LDOPTS += \ $(MOZ_JS_LIBS) \ $(NULL) -ifdef ENABLE_TESTS -DIRS += tests -endif +TEST_DIRS += tests include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/urlformatter/Makefile.in b/toolkit/components/urlformatter/Makefile.in index b88c959f99b2..e48d7d55a6de 100644 --- a/toolkit/components/urlformatter/Makefile.in +++ b/toolkit/components/urlformatter/Makefile.in @@ -56,8 +56,6 @@ EXTRA_PP_COMPONENTS = \ nsURLFormatter.js \ $(NULL) -ifdef ENABLE_TESTS -DIRS += tests -endif +TEST_DIRS += tests include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/viewsource/Makefile.in b/toolkit/components/viewsource/Makefile.in index 73ef499ba8de..43aef5003de0 100644 --- a/toolkit/components/viewsource/Makefile.in +++ b/toolkit/components/viewsource/Makefile.in @@ -43,8 +43,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -ifdef ENABLE_TESTS -DIRS = test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/toolkit/content/Makefile.in b/toolkit/content/Makefile.in index 6d8d6f44a7dc..38ae0a81df09 100644 --- a/toolkit/content/Makefile.in +++ b/toolkit/content/Makefile.in @@ -81,9 +81,7 @@ ifdef MOZ_TOOLKIT_SEARCH DEFINES += -DMOZ_TOOLKIT_SEARCH endif -ifdef ENABLE_TESTS -DIRS += tests -endif +TEST_DIRS += tests EXTRA_JS_MODULES = \ Geometry.jsm \ diff --git a/toolkit/mozapps/downloads/Makefile.in b/toolkit/mozapps/downloads/Makefile.in index 1465ff0e76b3..38be5478c4b7 100644 --- a/toolkit/mozapps/downloads/Makefile.in +++ b/toolkit/mozapps/downloads/Makefile.in @@ -59,8 +59,6 @@ EXTRA_JS_MODULES += \ $(NULL) endif -ifdef ENABLE_TESTS -DIRS += tests -endif +TEST_DIRS += tests include $(topsrcdir)/config/rules.mk diff --git a/toolkit/mozapps/extensions/Makefile.in b/toolkit/mozapps/extensions/Makefile.in index b4b01793f000..dc9d45a1e785 100644 --- a/toolkit/mozapps/extensions/Makefile.in +++ b/toolkit/mozapps/extensions/Makefile.in @@ -76,9 +76,7 @@ EXTRA_JS_MODULES = \ SpellCheckDictionaryBootstrap.js \ $(NULL) -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test EXTRA_DSO_LDOPTS = \ $(MOZ_JS_LIBS) \ diff --git a/toolkit/mozapps/plugins/Makefile.in b/toolkit/mozapps/plugins/Makefile.in index b0fa1151ca3d..796c52d5f041 100644 --- a/toolkit/mozapps/plugins/Makefile.in +++ b/toolkit/mozapps/plugins/Makefile.in @@ -44,8 +44,6 @@ include $(DEPTH)/config/autoconf.mk EXTRA_COMPONENTS = pluginGlue.manifest -ifdef ENABLE_TESTS -DIRS += tests -endif +TEST_DIRS += tests include $(topsrcdir)/config/rules.mk diff --git a/toolkit/profile/Makefile.in b/toolkit/profile/Makefile.in index bddf7f137037..d0f473e1cd78 100644 --- a/toolkit/profile/Makefile.in +++ b/toolkit/profile/Makefile.in @@ -68,9 +68,7 @@ DEFINES += -DIMPL_XREAPI GARBAGE += nsProfileLock.cpp -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/rules.mk diff --git a/toolkit/themes/pinstripe/Makefile.in b/toolkit/themes/pinstripe/Makefile.in index 305dc5faefa3..3c8399b8d0c3 100644 --- a/toolkit/themes/pinstripe/Makefile.in +++ b/toolkit/themes/pinstripe/Makefile.in @@ -48,8 +48,6 @@ ifdef MOZ_HELP_VIEWER DIRS += help endif -ifdef ENABLE_TESTS -DIRS += mochitests -endif +TEST_DIRS += mochitests include $(topsrcdir)/config/rules.mk diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in index 8c347c964d06..a240d24ae827 100644 --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in @@ -180,9 +180,7 @@ SHARED_LIBRARY_LIBS += \ endif endif -ifdef ENABLE_TESTS -DIRS += test -endif +TEST_DIRS += test include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in index 5b29d2a52b3e..23553616667e 100644 --- a/uriloader/exthandler/Makefile.in +++ b/uriloader/exthandler/Makefile.in @@ -44,9 +44,7 @@ include $(DEPTH)/config/autoconf.mk DIRS = \ $(NULL) -ifdef ENABLE_TESTS - DIRS += tests -endif +TEST_DIRS += tests ifeq ($(MOZ_WIDGET_TOOLKIT),os2) OSDIR = os2