Merge m-c to m-i

dom/imptests/webapps/DOMCore/tests/approved/Makefile.in

@@ -29,9 +29,15 @@ MOCHITEST_FILES := \
   test_Range-mutations.html \
   test_Range-selectNode.html \
   test_Range-set.html \
-  test_Range-surroundContents.html \
   common.js \
   Range-test-iframe.html \
   $(NULL)
 
+# Temporarily disable on Windows for bug 875585 and deps
+ifneq (windows,$(MOZ_WIDGET_TOOLKIT))
+MOCHITEST_FILES += \
+  test_Range-surroundContents.html \
+  $(NULL)
+endif
+
 include $(topsrcdir)/config/rules.mk

image/test/crashtests/crashtests.list

@@ -31,7 +31,7 @@ load 256-height.ico
 HTTP load delayedframe.sjs
 
 load 681190.html
-skip-if(Android&&smallScreen) load 694165-1.xhtml # nexus-s Android 2.3.6
+skip-if(Android&&smallScreen) skip-if(B2G) load 694165-1.xhtml # nexus-s Android 2.3.6, bug 876275 for B2G on a VM
 load 732319-1.html
 load 844403-1.html