Bug 688128 - Don't run test_flush_on_paint.html on OS X, where it mostly fails, r=roc
authorPhil Ringnalda <philringnalda@gmail.com>
Fri, 18 May 2012 22:22:55 -0700
changeset 96731 9a684c3344a5fdd75b6295d4de0a8e31bd792c91
parent 96730 5648c9a38933b385c3aa762c5ed579ea7100dcff
child 96732 45118cc6518bbe29688877983c32acf92fd1834d
push id1439
push userlsblakk@mozilla.com
push dateMon, 04 Jun 2012 20:19:22 +0000
treeherdermozilla-aurora@ea74834dccd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc
bugs688128
milestone15.0a1
Bug 688128 - Don't run test_flush_on_paint.html on OS X, where it mostly fails, r=roc
layout/base/tests/Makefile.in
--- a/layout/base/tests/Makefile.in
+++ b/layout/base/tests/Makefile.in
@@ -169,17 +169,16 @@ DEFINES += -D_IMPL_NS_LAYOUT
 		test_bug582181-1.html \
 		test_bug582181-2.html \
 		test_bug588174.html \
 		test_bug607529.html \
 		file_bug607529.html \
 		test_bug667512.html \
 		test_bug677878.html \
 		test_bug696020.html \
-		test_flush_on_paint.html \
 		test_mozPaintCount.html \
 		test_scroll_selection_into_view.html \
 		test_bug583889.html \
 		bug583889_inner1.html \
 		bug583889_inner2.html \
 		test_bug582771.html \
 		test_bug603550.html \
 		test_bug629838.html \
@@ -375,16 +374,25 @@ ifeq (,$(filter windows,$(MOZ_WIDGET_TOO
 		$(NULL)
 # THESE TESTS (ABOVE AND BELOW) DO NOT RUN ON WINDOWS
 _TEST_FILES += \
 		test_bug644768.html \
 		$(NULL)
 # THESE TESTS (ABOVE) DO NOT RUN ON WINDOWS
 endif
 
+# test_flush_on_paint.html fails frequently on Mac, bug 688128
+ifeq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT)))
+# THESE TESTS (BELOW) DO NOT RUN ON MAC
+_TEST_FILES += \
+		test_flush_on_paint.html \
+		$(NULL)
+# THESE TESTS (ABOVE) DO NOT RUN ON MAC
+endif
+
 _BROWSER_FILES = \
 	browser_bug617076.js \
 	$(NULL)
 
 libs:: $(_TEST_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
 libs:: $(_BROWSER_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)