Bug 702388 - Convert Makefiles to use |TEST_DIRS += foo| r=khuey

Files named Makefile.in containing the expression DIRS += <foo> or DIRS = <foo> 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 += <foo> etc) and they remain unchanged by this patch.
2012-02-04 17:32:24 +00:00 · 2012-02-04 17:32:24 +00:00 · 9c7dfb9706
--- 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

--- 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

--- 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
--- 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

--- 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
--- 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

--- 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

--- 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
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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

--- 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

--- 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 \
--- 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

--- 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

--- 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

--- 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 \
--- 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
--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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
--- 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

--- 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
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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

--- 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

--- 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
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 \
--- 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
--- 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) \
--- 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
--- 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

--- 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
--- 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
--- 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