Merge m-c to inbound.

dothq · Jan 16, 2014 · 58f657b · 58f657b
2 parents 021c779 + a9e695f
commit 58f657b
Showing 1 changed file with 11 additions and 12 deletions.
diff --git a/dom/browser-element/mochitest/Makefile.in b/dom/browser-element/mochitest/Makefile.in
@@ -182,7 +182,16 @@ MOCHITEST_FILES = \
 # Both the "inproc" and "oop" versions of OpenMixedProcess open remote frames,
 # so we don't run that test on platforms which don't support OOP tests.
 
+
+# Bug 960345 - Disabled on OSX debug for frequent crashes.
+ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+ifdef MOZ_DEBUG
+OSX_DEBUG=1
+endif
+endif
+
 ifndef MOZ_ANDROID_OMTC #{
+ifndef OSX_DEBUG
 MOCHITEST_FILES += \
 		browserElement_OpenMixedProcess.js \
 		file_browserElement_OpenMixedProcess.html \
@@ -211,6 +220,7 @@ MOCHITEST_FILES += \
 		test_browserElement_oop_Alert.html \
 		test_browserElement_oop_AlertInFrame.html \
 		test_browserElement_oop_TargetTop.html \
+		test_browserElement_oop_FirstPaint.html \
 		test_browserElement_oop_ForwardName.html \
 		test_browserElement_oop_TargetBlank.html \
 		test_browserElement_oop_PromptCheck.html \
@@ -238,18 +248,6 @@ MOCHITEST_FILES += \
 		test_browserElement_oop_VisibilityChange.html \
 		test_browserElement_oop_BrowserWindowResize.html \
 	$(NULL)
-
-# Disabled on OSX debug for frequent crashes.
-ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-ifdef MOZ_DEBUG
-SKIP_THIS_TEST=1
-endif
-endif
-ifndef SKIP_THIS_TEST
-MOCHITEST_FILES += \
-		test_browserElement_oop_FirstPaint.html \
-	$(NULL)
-endif
 
 # Disabled until bug 930449 makes it stop timing out
 #		test_browserElement_oop_ContextmenuEvents.html \
@@ -262,4 +260,5 @@ endif
 # Disabled until we fix bug 906096.
 #		test_browserElement_oop_SetInputMethodActive.html \
 
+endif # OSX_DEBUG
 endif #}