Bug 822284 - Disable browser_privatebrowsing_cookieacceptdialog.js & browser_privatebrowsing_crh.js on OS X for too many intermittent failures
authorEd Morley <emorley@mozilla.com>
Thu, 10 Jan 2013 15:46:09 +0000
changeset 118413 f3d89d6870e69563af14e0d97ef80f0528c09d78
parent 118412 9da8f50d3750fa79853cdacd5b9aa7cdd6196576
child 118414 1a7ca1f81bd21b1d678762a9586287294b25d378
push id24166
push userMs2ger@gmail.com
push dateFri, 11 Jan 2013 13:57:41 +0000
treeherdermozilla-central@63c4b0f66a0c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs822284
milestone21.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 822284 - Disable browser_privatebrowsing_cookieacceptdialog.js & browser_privatebrowsing_crh.js on OS X for too many intermittent failures
browser/components/privatebrowsing/test/browser/perwindow/Makefile.in
--- a/browser/components/privatebrowsing/test/browser/perwindow/Makefile.in
+++ b/browser/components/privatebrowsing/test/browser/perwindow/Makefile.in
@@ -10,19 +10,16 @@ relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MOCHITEST_BROWSER_FILES =  \
 		head.js \
 		browser_privatebrowsing_certexceptionsui.js \
 		browser_privatebrowsing_concurrent.js \
 		browser_privatebrowsing_concurrent_page.html \
-		browser_privatebrowsing_cookieacceptdialog.js \
-		browser_privatebrowsing_cookieacceptdialog.html \
-		browser_privatebrowsing_crh.js \
 		browser_privatebrowsing_downloadLastDir.js \
 		browser_privatebrowsing_downloadLastDir_c.js \
 		browser_privatebrowsing_downloadLastDir_toggle.js \
 		browser_privatebrowsing_DownloadLastDirWithCPS.js \
 		browser_privatebrowsing_geoprompt.js \
 		browser_privatebrowsing_geoprompt_page.html \
 		browser_privatebrowsing_lastpbcontextexited.js \
 		browser_privatebrowsing_localStorage.js \
@@ -46,9 +43,18 @@ MOCHITEST_BROWSER_FILES =  \
 		browser_privatebrowsing_windowtitle.js \
 		browser_privatebrowsing_windowtitle_page.html \
 		browser_privatebrowsing_zoom.js \
 		browser_privatebrowsing_zoomrestore.js \
 		popup.html \
 		title.sjs \
 		$(NULL)
 
+# Temporarily disabled on OS X for bug 822284
+ifneq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+MOCHITEST_BROWSER_FILES += \
+		browser_privatebrowsing_cookieacceptdialog.js \
+		browser_privatebrowsing_cookieacceptdialog.html \
+		browser_privatebrowsing_crh.js \
+		$(NULL)
+endif
+
 include $(topsrcdir)/config/rules.mk