Bug 759013 - Convert more makefiles to use TEST_DIRS, r=khuey
authorMichael Wu <mwu@mozilla.com>
Sun, 27 May 2012 23:25:22 -0400
changeset 96357 943402d31225f55a343b1646c7bf8c5dc48e4c42
parent 96356 2d4c140e2f47326f5014f6eab482a1914382cab5
child 96358 62d7c3276ceb94841707241305116235629d28ff
push id22904
push useremorley@mozilla.com
push dateTue, 12 Jun 2012 09:45:09 +0000
treeherdermozilla-central@733994f12c53 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs759013
milestone16.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 759013 - Convert more makefiles to use TEST_DIRS, r=khuey
browser/components/downloads/Makefile.in
browser/components/thumbnails/Makefile.in
browser/devtools/debugger/Makefile.in
browser/devtools/layoutview/Makefile.in
content/media/Makefile.in
content/xul/content/Makefile.in
dom/contacts/Makefile.in
dom/power/Makefile.in
dom/settings/Makefile.in
modules/libmar/Makefile.in
toolkit/devtools/debugger/Makefile.in
--- a/browser/components/downloads/Makefile.in
+++ b/browser/components/downloads/Makefile.in
@@ -6,13 +6,11 @@ DEPTH     = ../../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DIRS = src
 
-ifdef ENABLE_TESTS
-DIRS += test
-endif
+TEST_DIRS += test
 
 include $(topsrcdir)/config/rules.mk
--- a/browser/components/thumbnails/Makefile.in
+++ b/browser/components/thumbnails/Makefile.in
@@ -13,15 +13,13 @@ EXTRA_COMPONENTS = \
 	BrowserPageThumbs.manifest \
 	PageThumbsProtocol.js \
 	$(NULL)
 
 EXTRA_PP_JS_MODULES = \
 	PageThumbs.jsm \
 	$(NULL)
 
-ifdef ENABLE_TESTS
-	DIRS += test
-endif
+TEST_DIRS += test
 
 include $(topsrcdir)/config/rules.mk
 
 XPIDL_FLAGS += -I$(topsrcdir)/browser/components/
--- a/browser/devtools/debugger/Makefile.in
+++ b/browser/devtools/debugger/Makefile.in
@@ -4,16 +4,14 @@
 
 DEPTH     = ../../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifdef ENABLE_TESTS
-	DIRS += test
-endif
+TEST_DIRS += test
 
 include $(topsrcdir)/config/rules.mk
 
 libs::
 	$(NSINSTALL) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools
--- a/browser/devtools/layoutview/Makefile.in
+++ b/browser/devtools/layoutview/Makefile.in
@@ -5,16 +5,14 @@
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifdef ENABLE_TESTS
-	DIRS += test
-endif
+TEST_DIRS += test
 
 include $(topsrcdir)/config/rules.mk
 
 libs::
 	$(NSINSTALL) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools
--- a/content/media/Makefile.in
+++ b/content/media/Makefile.in
@@ -82,19 +82,17 @@ endif
 ifdef MOZ_GSTREAMER
 PARALLEL_DIRS += gstreamer
 endif
 
 ifdef MOZ_MEDIA_PLUGINS
 PARALLEL_DIRS += plugins
 endif
 
-ifdef ENABLE_TESTS
-PARALLEL_DIRS += test
-endif
+TEST_DIRS += test
 
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -D_IMPL_NS_LAYOUT
--- a/content/xul/content/Makefile.in
+++ b/content/xul/content/Makefile.in
@@ -8,14 +8,12 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xul
 PARALLEL_DIRS	= public src
 
-ifdef ENABLE_TESTS
-PARALLEL_DIRS	+= test
-endif
+TEST_DIRS	+= test
 
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/contacts/Makefile.in
+++ b/dom/contacts/Makefile.in
@@ -26,19 +26,17 @@ EXTRA_COMPONENTS =        \
 
 ifeq ($(MOZ_BUILD_APP), $(filter $(MOZ_BUILD_APP),b2g mail))
 EXTRA_JS_MODULES =   \
   ContactService.jsm \
   ContactDB.jsm      \
   $(NULL)
 endif
 
-ifdef ENABLE_TESTS
-DIRS += tests
-endif
+TEST_DIRS += tests
 
 # Add VPATH to LOCAL_INCLUDES so we are going to include the correct backend
 # subdirectory (and the ipc one).
 LOCAL_INCLUDES += $(VPATH:%=-I%)
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
--- a/dom/power/Makefile.in
+++ b/dom/power/Makefile.in
@@ -31,15 +31,13 @@ CPPSRCS = \
 
 XPIDLSRCS = \
   nsIDOMPowerManager.idl \
   nsIDOMWakeLock.idl \
   nsIDOMWakeLockListener.idl \
   nsIPowerManagerService.idl \
   $(NULL)
 
-ifdef ENABLE_TESTS
-DIRS += test
-endif
+TEST_DIRS += test
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
--- a/dom/settings/Makefile.in
+++ b/dom/settings/Makefile.in
@@ -23,19 +23,17 @@ EXTRA_COMPONENTS =         \
   $(NULL)
 
 EXTRA_JS_MODULES =   \
   SettingsQueue.jsm  \
   SettingsDB.jsm     \
   SettingsChangeNotifier.jsm \
   $(NULL)
 
-ifdef ENABLE_TESTS
-DIRS += tests
-endif
+TEST_DIRS += tests
 
 # Add VPATH to LOCAL_INCLUDES so we are going to include the correct backend
 # subdirectory (and the ipc one).
 # LOCAL_INCLUDES += $(VPATH:%=-I%)
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
--- a/modules/libmar/Makefile.in
+++ b/modules/libmar/Makefile.in
@@ -21,15 +21,13 @@ ifeq ($(OS_ARCH),WINNT)
 # On Windows we don't verify with NSS and updater needs to link to it
 DIRS += verify
 endif
 endif
 
 # If we are building ./sign and ./verify then ./tool must come after it
 DIRS += tool
 
-ifdef ENABLE_TESTS
 ifdef MOZ_ENABLE_SIGNMAR
-DIRS += tests
-endif
+TEST_DIRS += tests
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/devtools/debugger/Makefile.in
+++ b/toolkit/devtools/debugger/Makefile.in
@@ -27,17 +27,15 @@ EXTRA_DSO_LDOPTS += \
     $(MOZ_COMPONENT_LIBS) \
     $(MOZ_JS_LIBS) \
     $(NULL)
 
 XPIDLSRCS = \
 	nsIJSInspector.idl \
 	$(NULL)
 
-ifdef ENABLE_TESTS
-    DIRS += tests
-endif
+TEST_DIRS += tests
 
 include $(topsrcdir)/config/rules.mk
 
 libs::
 	$(INSTALL) $(IFLAGS1) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools
 	$(INSTALL) $(IFLAGS1) $(srcdir)/server/*.jsm $(FINAL_TARGET)/modules/devtools