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 110446 21c42ad33eca5969585560dbc7b28fdc5cb4b10c
parent 110445 896e8053f724d8660f6869bbdab61b566f7c4825
child 110447 2dc84b223c276efec569468ac59e87fc20f9c109
push id16559
push usereakhgari@mozilla.com
push dateTue, 16 Oct 2012 22:10:43 +0000
treeherdermozilla-inbound@2dc84b223c27 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjdm
bugs801661
milestone19.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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)