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

build/win32/Makefile.in

@@ -44,18 +44,18 @@ 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

dom/sms/Makefile.in

@@ -45,8 +45,8 @@ include $(DEPTH)/config/autoconf.mk
 
 PARALLEL_DIRS = interfaces src
 
+TEST_DIRS += tests
 ifdef ENABLE_TESTS
-DIRS += tests
 XPCSHELL_TESTS = tests
 endif
 

embedding/Makefile.in

@@ -48,9 +48,9 @@ MODULE       = embed
 
 DIRS = base components browser
 
+TEST_DIRS += test
 ifdef ENABLE_TESTS
 XPCSHELL_TESTS = tests/unit
-DIRS += test
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),android)

toolkit/components/startup/Makefile.in

@@ -73,10 +73,8 @@ 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

toolkit/mozapps/shared/Makefile.in

@@ -50,8 +50,9 @@ EXTRA_PP_JS_MODULES = \
   FileUtils.jsm \
   $(NULL)
 
+TEST_DIRS += test/chrome
+
 ifdef ENABLE_TESTS
-DIRS += test/chrome
 XPCSHELL_TESTS = test/unit
 endif
 

toolkit/mozapps/update/Makefile.in

@@ -77,14 +77,12 @@ 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