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.

include $(MOZILLA_DIR)/build/binary-location.mk

browser_path := \"$(browser_path)\"

_PROFILE_DIR = $(TARGET_DEPTH)/_profile/pgo

ABSOLUTE_TOPSRCDIR = $(call core_abspath,$(MOZILLA_DIR))
_CERTS_SRC_DIR = $(ABSOLUTE_TOPSRCDIR)/build/pgo/certs

AUTOMATION_PPARGS = 	\
			-DBROWSER_PATH=$(browser_path) \
			-DXPC_BIN_PATH=\"$(LIBXUL_DIST)/bin\" \
			-DBIN_SUFFIX=\"$(BIN_SUFFIX)\" \
			-DPROFILE_DIR=\"$(_PROFILE_DIR)\" \
			-DCERTS_SRC_DIR=\"$(_CERTS_SRC_DIR)\" \
			-DPERL="\"$(PERL)\"" \
			$(NULL)

ifeq ($(OS_ARCH),Darwin)
AUTOMATION_PPARGS += -DIS_MAC=1
else
AUTOMATION_PPARGS += -DIS_MAC=0
endif

ifeq ($(OS_ARCH),Linux)
AUTOMATION_PPARGS += -DIS_LINUX=1
else
AUTOMATION_PPARGS += -DIS_LINUX=0
endif

ifeq ($(MOZ_BUILD_APP),camino)
AUTOMATION_PPARGS += -DIS_CAMINO=1
else
AUTOMATION_PPARGS += -DIS_CAMINO=0
endif

ifeq ($(host_os), cygwin)
AUTOMATION_PPARGS += -DIS_CYGWIN=1
endif

ifeq ($(ENABLE_TESTS), 1)
AUTOMATION_PPARGS += -DIS_TEST_BUILD=1
else
AUTOMATION_PPARGS += -DIS_TEST_BUILD=0
endif

ifeq ($(MOZ_DEBUG), 1)
AUTOMATION_PPARGS += -DIS_DEBUG_BUILD=1
else
AUTOMATION_PPARGS += -DIS_DEBUG_BUILD=0
endif

ifdef MOZ_CRASHREPORTER
AUTOMATION_PPARGS += -DCRASHREPORTER=1
else
AUTOMATION_PPARGS += -DCRASHREPORTER=0
endif

automation.py: $(MOZILLA_DIR)/build/automation.py.in $(MOZILLA_DIR)/build/automation-build.mk
	$(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py \
	$(AUTOMATION_PPARGS) $(DEFINES) $(ACDEFINES) $< > $@

GARBAGE += automation.py automation.pyc