Bug 777627. Make sure we can't accidentally turn off mochitests for a directory by reordering the Makefile.in. r=khuey

This commit is contained in:
Boris Zbarsky 2012-07-26 12:38:03 -04:00
parent ae3833ac3f
commit 168d572fc7
3 changed files with 20 additions and 4 deletions

View File

@ -1746,6 +1746,13 @@ FREEZE_VARIABLES = \
TIERS \
EXTRA_COMPONENTS \
EXTRA_PP_COMPONENTS \
MOCHITEST_FILES \
MOCHITEST_FILES_PARTS \
MOCHITEST_CHROME_FILES \
MOCHITEST_BROWSER_FILES \
MOCHITEST_BROWSER_FILES_PARTS \
MOCHITEST_A11Y_FILES \
MOCHITEST_WEBAPPRT_CHROME_FILES \
$(NULL)
$(foreach var,$(FREEZE_VARIABLES),$(eval $(var)_FROZEN := '$($(var))'))

View File

@ -1746,6 +1746,13 @@ FREEZE_VARIABLES = \
TIERS \
EXTRA_COMPONENTS \
EXTRA_PP_COMPONENTS \
MOCHITEST_FILES \
MOCHITEST_FILES_PARTS \
MOCHITEST_CHROME_FILES \
MOCHITEST_BROWSER_FILES \
MOCHITEST_BROWSER_FILES_PARTS \
MOCHITEST_A11Y_FILES \
MOCHITEST_WEBAPPRT_CHROME_FILES \
$(NULL)
$(foreach var,$(FREEZE_VARIABLES),$(eval $(var)_FROZEN := '$($(var))'))

View File

@ -43,10 +43,6 @@ EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(MOZ_COMPONENT_LIBS) $(XPCOM_GLUE_LDOPTS)
EXTRA_JS_MODULES = CrashTestUtils.jsm
include $(topsrcdir)/config/rules.mk
DEFINES += -DSHARED_LIBRARY=$(SHARED_LIBRARY) -DNOMINMAX
ifneq (mobile,$(MOZ_BUILD_APP))
MOCHITEST_BROWSER_FILES = \
browser/head.js \
@ -55,7 +51,13 @@ MOCHITEST_BROWSER_FILES = \
browser/browser_bug471404.js \
browser/browser_aboutCrashesResubmit.js \
$(NULL)
endif
include $(topsrcdir)/config/rules.mk
DEFINES += -DSHARED_LIBRARY=$(SHARED_LIBRARY) -DNOMINMAX
ifneq (mobile,$(MOZ_BUILD_APP))
libs:: $(MOCHITEST_BROWSER_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)/browser
endif