Bug 801661 - Disable browser_privacypane_7.js and its in-content variant in per-window PB mode; r=jdm
authorEhsan Akhgari <ehsan@mozilla.com>
Tue, 16 Oct 2012 18:03:25 -0400
changeset 110606 21c42ad33eca5969585560dbc7b28fdc5cb4b10c
parent 110605 896e8053f724d8660f6869bbdab61b566f7c4825
child 110607 2dc84b223c276efec569468ac59e87fc20f9c109
push id93
push usernmatsakis@mozilla.com
push dateWed, 31 Oct 2012 21:26:57 +0000
reviewersjdm
bugs801661
milestone19.0a1
Bug 801661 - Disable browser_privacypane_7.js and its in-content variant in per-window PB mode; r=jdm
browser/components/preferences/in-content/tests/Makefile.in
browser/components/preferences/tests/Makefile.in
--- a/browser/components/preferences/in-content/tests/Makefile.in
+++ b/browser/components/preferences/in-content/tests/Makefile.in
@@ -20,14 +20,17 @@ include $(topsrcdir)/config/rules.mk
     browser_connection.js \
     privacypane_tests.js \
     browser_privacypane_1.js \
     browser_privacypane_2.js \
     browser_privacypane_3.js \
     browser_privacypane_4.js \
     browser_privacypane_5.js \
     browser_privacypane_6.js \
-    browser_privacypane_7.js \
     browser_privacypane_8.js \
     $(NULL)
 
+ifndef MOZ_PER_WINDOW_PRIVATE_BROWSING
+_BROWSER_FILES += browser_privacypane_7.js
+endif
+
 libs::	$(_BROWSER_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
--- a/browser/components/preferences/tests/Makefile.in
+++ b/browser/components/preferences/tests/Makefile.in
@@ -18,16 +18,19 @@ include $(topsrcdir)/config/rules.mk
     browser_bug705422.js \
     privacypane_tests.js \
     browser_privacypane_1.js \
     browser_privacypane_2.js \
     browser_privacypane_3.js \
     browser_privacypane_4.js \
     browser_privacypane_5.js \
     browser_privacypane_6.js \
-    browser_privacypane_7.js \
     browser_privacypane_8.js \
     browser_permissions.js \
     browser_chunk_permissions.js \
     $(NULL)
 
+ifndef MOZ_PER_WINDOW_PRIVATE_BROWSING
+_BROWSER_FILES += browser_privacypane_7.js
+endif
+
 libs::	$(_BROWSER_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)