From 168d572fc72f887807d3f37c6a2f33d6ad430ee7 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Thu, 26 Jul 2012 12:38:03 -0400
Subject: [PATCH] Bug 777627.  Make sure we can't accidentally turn off
 mochitests for a directory by reordering the Makefile.in.  r=khuey

---
 config/rules.mk                        |  7 +++++++
 js/src/config/rules.mk                 |  7 +++++++
 toolkit/crashreporter/test/Makefile.in | 10 ++++++----
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/config/rules.mk b/config/rules.mk
index f2a5b76c950..640894f887d 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -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))'))
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
index f2a5b76c950..640894f887d 100644
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -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))'))
diff --git a/toolkit/crashreporter/test/Makefile.in b/toolkit/crashreporter/test/Makefile.in
index 9bf355ff8cd..8e8dcf673d1 100644
--- a/toolkit/crashreporter/test/Makefile.in
+++ b/toolkit/crashreporter/test/Makefile.in
@@ -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