Bug 702388 - Convert some more Makefiles to use |TEST_DIRS += foo|; r=khuey
authorPanagiotis Koutsourakis <panagiotis.koutsourakis@gmail.com>
Fri, 10 Feb 2012 21:06:56 +0000
changeset 88149 1f30e16bf02d2d697b83c454bbcb9eae1fda65b4
parent 88148 d6c2ee4091e41067330bc1891da27f5383f141a7
child 88150 7d0691b7e2ca08576a988cb7a0b5e5278fb90b62
push id975
push userffxbld
push dateTue, 13 Mar 2012 21:39:16 +0000
treeherdermozilla-aurora@99faebf9dc36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs702388
milestone13.0a1
Bug 702388 - Convert some more Makefiles to use |TEST_DIRS += foo|; r=khuey
build/win32/Makefile.in
dom/sms/Makefile.in
embedding/Makefile.in
toolkit/components/startup/Makefile.in
toolkit/mozapps/shared/Makefile.in
toolkit/mozapps/update/Makefile.in
--- a/build/win32/Makefile.in
+++ b/build/win32/Makefile.in
@@ -39,28 +39,28 @@ DEPTH = ../..
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 NO_PROFILE_GUIDED_OPTIMIZE = 1
 
-ifdef ENABLE_TESTS
-
 ifdef _MSC_VER
 ifneq ($(OS_TEST),x86_64)
-DIRS += vmwarerecordinghelper
+TEST_DIRS += vmwarerecordinghelper
 endif
 endif
 
-DIRS += \
+TEST_DIRS += \
   crashinjectdll \
   $(NULL)
 
+ifdef ENABLE_TESTS
+
 PROGRAM = crashinject$(BIN_SUFFIX)
 USE_STATIC_LIBS = 1
 CPPSRCS = crashinject.cpp
 
 endif # ENABLE_TESTS
 
 MOZ_GLUE_LDFLAGS =
 
--- a/dom/sms/Makefile.in
+++ b/dom/sms/Makefile.in
@@ -40,14 +40,14 @@ srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 relativesrcdir   = dom/sms
 
 include $(DEPTH)/config/autoconf.mk
 
 PARALLEL_DIRS = interfaces src
 
+TEST_DIRS += tests
 ifdef ENABLE_TESTS
-DIRS += tests
 XPCSHELL_TESTS = tests
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/embedding/Makefile.in
+++ b/embedding/Makefile.in
@@ -43,19 +43,19 @@ VPATH		= @srcdir@
 relativesrcdir = embedding
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE       = embed
 
 DIRS = base components browser
 
+TEST_DIRS += test
 ifdef ENABLE_TESTS
 XPCSHELL_TESTS = tests/unit
-DIRS += test
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),android)
 ifneq (,$(filter mobile/xul b2g,$(MOZ_BUILD_APP)))
 DIRS += android
 endif
 endif
 
--- a/toolkit/components/startup/Makefile.in
+++ b/toolkit/components/startup/Makefile.in
@@ -68,15 +68,13 @@ CMMSRCS += nsUserInfoMac.mm
 else
 CPPSRCS += nsUserInfoUnix.cpp
 endif
 endif
 endif
 
 XPCSHELL_TESTS = tests/unit
 
-ifdef ENABLE_TESTS
 ifneq (mobile,$(MOZ_BUILD_APP))
-DIRS += tests/browser
-endif
+TEST_DIRS += tests/browser
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/mozapps/shared/Makefile.in
+++ b/toolkit/mozapps/shared/Makefile.in
@@ -45,14 +45,15 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE = toolkitShared
 
 EXTRA_PP_JS_MODULES = \
   CertUtils.jsm \
   FileUtils.jsm \
   $(NULL)
 
+TEST_DIRS += test/chrome
+
 ifdef ENABLE_TESTS
-DIRS += test/chrome
 XPCSHELL_TESTS = test/unit
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/mozapps/update/Makefile.in
+++ b/toolkit/mozapps/update/Makefile.in
@@ -72,20 +72,18 @@ else
 ifdef MOZ_MAINTENANCE_SERVICE
 DIRS = ../readstrings
 ifneq ($(OS_TARGET),Android)
 DIRS += common
 endif
 endif
 endif
 
-ifdef ENABLE_TESTS
-DIRS += test_timermanager
+TEST_DIRS += test_timermanager
 # Update tests require the updater binary
 ifdef MOZ_UPDATER
-DIRS += test
+TEST_DIRS += test
 ifdef MOZ_MAINTENANCE_SERVICE
-DIRS += test_svc
-endif
+TEST_DIRS += test_svc
 endif
 endif
 
 include $(topsrcdir)/config/rules.mk