Bug 970925 - convert testing/mochitest/android.json into skip-if statements in mochitest.ini files; r=jmaher
authorVaibhav Agarwal <vaibhavmagarwal@gmail.com>
Wed, 12 Mar 2014 06:16:12 -0400
changeset 191388 91f4d6270e24c84a67b49e5a71583e4af041dd93
parent 191387 917cdd57679e12f371ff3cb935c0ef65a8fc2249
child 191389 6df586c17279231c5c8385a751767f4b2dcd4208
push id474
push userasasaki@mozilla.com
push dateMon, 02 Jun 2014 21:01:02 +0000
treeherdermozilla-release@967f4cf1b31c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs970925
milestone30.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 970925 - convert testing/mochitest/android.json into skip-if statements in mochitest.ini files; r=jmaher
content/canvas/test/webgl/mochitest.ini
content/canvas/test/webgl/non-conf-tests/mochitest.ini
content/media/test/mochitest.ini
dom/browser-element/mochitest/mochitest-oop.ini
dom/browser-element/mochitest/mochitest.ini
dom/devicestorage/ipc/mochitest.ini
dom/devicestorage/test/mochitest.ini
dom/imptests/editing/mochitest.ini
dom/imptests/html/mochitest.ini
dom/imptests/webapps/mochitest.ini
dom/inputmethod/mochitest/mochitest.ini
layout/generic/test/mochitest.ini
testing/mochitest/android.json
testing/mochitest/android23.json
testing/mochitest/androidx86.json
testing/mochitest/tests/Harness_sanity/mochitest.ini
--- a/content/canvas/test/webgl/mochitest.ini
+++ b/content/canvas/test/webgl/mochitest.ini
@@ -12,9 +12,9 @@ support-files =
   failing_tests_windows.txt
   skipped_tests_android.txt
   skipped_tests_android_x86.txt
   skipped_tests_linux_mesa.txt
   skipped_tests_win_vista.txt
   skipped_tests_winxp.txt
 
 [test_webgl_conformance_test_suite.html]
-skip-if = buildapp == 'b2g'
+skip-if = (toolkit == 'android') || (buildapp == 'b2g') #android(bug 865443- seperate suite - the non_conf* tests pass except for one on armv6 tests)
--- a/content/canvas/test/webgl/non-conf-tests/mochitest.ini
+++ b/content/canvas/test/webgl/non-conf-tests/mochitest.ini
@@ -5,12 +5,17 @@ support-files =
 
 [test_depth_readpixels.html]
 [test_fb_param.html]
 [test_fb_param_crash.html]
 [test_highp_fs.html]
 [test_no_arr_points.html]
 [test_privileged_exts.html]
 [test_webgl_available.html]
+skip-if = toolkit == 'android' #bug 865443- seperate suite - the non_conf* tests pass except for one on armv6 tests
 [test_webgl_conformance.html]
+skip-if = toolkit == 'android' #bug 865443- seperate suite - the non_conf* tests pass except for one on armv6 tests
 [test_webgl_request_context.html]
+skip-if = toolkit == 'android' #bug 865443- seperate suite - the non_conf* tests pass except for one on armv6 tests
 [test_webgl_request_mismatch.html]
+skip-if = toolkit == 'android' #bug 865443- seperate suite - the non_conf* tests pass except for one on armv6 tests
 [test_webgl2_not_exposed.html]
+skip-if = toolkit == 'android' #bug 865443- seperate suite - the non_conf* tests pass except for one on armv6 tests
--- a/content/media/test/mochitest.ini
+++ b/content/media/test/mochitest.ini
@@ -470,25 +470,25 @@ skip-if = buildapp == 'b2g'
 # about reenabling it on any platform unless you *know* that you have fixed
 # that. Then don't think about reenabling it on Windows until you know that
 # you have fixed the timeouts of bug 832768, bug 814533, bug 840742
 
 [test_play_twice.html]
 skip-if = appname == "seamonkey" # See bug 598252
 
 [test_buffered.html]
-skip-if = os == "win" # See bug 832768 and 864682
+skip-if = toolkit == 'android' || os == "win" # See bug 832768 and 864682
 [test_bug465498.html]
 skip-if = os == "win" # See bug 832768 and 864682
 [test_bug493187.html]
 skip-if = os == "win" || (buildapp=='b2g'&&debug) # See bug 707777, #b2g-emulator-debug - process crash
 [test_media_selection.html]
 skip-if = os == "win" # See bug 897843
 [test_seek.html]
-skip-if = os == "win" # See bug 832678, 795271, and 857424
+skip-if = toolkit == 'android' || os == "win" # See bug 832678, 795271, and 857424 # android(bug 845162) androidx86(bug 845162)
 
 # The tests below contain backend-specific tests. Write backend independent
 # tests rather than adding to this list.
 
 [test_can_play_type_webm.html]
 run-if = webm
 [test_can_play_type_no_webm.html]
 skip-if = webm
--- a/dom/browser-element/mochitest/mochitest-oop.ini
+++ b/dom/browser-element/mochitest/mochitest-oop.ini
@@ -45,16 +45,17 @@ skip-if = toolkit=='gonk'
 [test_browserElement_oop_PromptCheck.html]
 [test_browserElement_oop_PromptConfirm.html]
 [test_browserElement_oop_PurgeHistory.html]
 [test_browserElement_oop_Reload.html]
 [test_browserElement_oop_ReloadPostRequest.html]
 [test_browserElement_oop_RemoveBrowserElement.html]
 [test_browserElement_oop_ScrollEvent.html]
 [test_browserElement_oop_SecurityChange.html]
+skip-if = toolkit == 'android' #TIMED_OUT, bug 766586
 [test_browserElement_oop_SendEvent.html]
 [test_browserElement_oop_SetVisible.html]
 [test_browserElement_oop_SetVisibleFrames.html]
 [test_browserElement_oop_SetVisibleFrames2.html]
 [test_browserElement_oop_Stop.html]
 [test_browserElement_oop_TargetBlank.html]
 [test_browserElement_oop_TargetTop.html]
 [test_browserElement_oop_Titlechange.html]
--- a/dom/browser-element/mochitest/mochitest.ini
+++ b/dom/browser-element/mochitest/mochitest.ini
@@ -105,29 +105,29 @@ support-files =
 # process.  Default is OOP.
 [test_browserElement_NoAttr.html]
 [test_browserElement_NoPref.html]
 [test_browserElement_NoPermission.html]
 [test_browserElement_inproc_Alert.html]
 skip-if = buildapp == 'b2g'
 [test_browserElement_inproc_AlertInFrame.html]
 [test_browserElement_inproc_AppFramePermission.html]
-skip-if = buildapp == 'b2g'
+skip-if = toolkit == 'android' || buildapp == 'b2g'
 [test_browserElement_inproc_AppWindowNamespace.html]
-skip-if = buildapp == 'b2g'
+skip-if = toolkit == 'android' || buildapp == 'b2g' # android(TIMED_OUT, bug 783509) androidx86(TIMED_OUT, bug 783509)
 [test_browserElement_inproc_Auth.html]
 skip-if = buildapp == 'b2g'
 [test_browserElement_inproc_BackForward.html]
 [test_browserElement_inproc_BadScreenshot.html]
 [test_browserElement_inproc_BrowserWindowNamespace.html]
 skip-if = buildapp == 'b2g'
 [test_browserElement_inproc_BrowserWindowResize.html]
 [test_browserElement_inproc_Close.html]
 [test_browserElement_inproc_CloseApp.html]
-skip-if = buildapp == 'b2g'
+skip-if = toolkit == 'android' || buildapp == 'b2g' # android(FAILS, bug 796982) androidx86(FAILS, bug 796982)
 [test_browserElement_inproc_CloseFromOpener.html]
 skip-if = buildapp == 'b2g'
 [test_browserElement_inproc_ContextmenuEvents.html]
 [test_browserElement_inproc_CookiesNotThirdParty.html]
 [test_browserElement_inproc_DOMRequestError.html]
 [test_browserElement_inproc_DataURI.html]
 [test_browserElement_inproc_DocumentFirstPaint.html]
 [test_browserElement_inproc_ExposableURI.html]
@@ -156,17 +156,17 @@ skip-if = (toolkit == 'gonk' && !debug)
 [test_browserElement_inproc_Opensearch.html]
 [test_browserElement_inproc_PromptCheck.html]
 [test_browserElement_inproc_PromptConfirm.html]
 [test_browserElement_inproc_PurgeHistory.html]
 [test_browserElement_inproc_ReloadPostRequest.html]
 [test_browserElement_inproc_RemoveBrowserElement.html]
 [test_browserElement_inproc_ScrollEvent.html]
 [test_browserElement_inproc_SecurityChange.html]
-skip-if = (toolkit == 'gonk' && !debug)
+skip-if = toolkit == 'android' || (toolkit == 'gonk' && !debug) # android(TIMED_OUT, bug 766586) androidx86(TIMED_OUT, bug 766586)
 [test_browserElement_inproc_SendEvent.html]
 [test_browserElement_inproc_SetVisible.html]
 [test_browserElement_inproc_SetVisibleFrames.html]
 [test_browserElement_inproc_SetVisibleFrames2.html]
 [test_browserElement_inproc_Stop.html]
 [test_browserElement_inproc_TargetBlank.html]
 skip-if = (toolkit == 'gonk' && !debug)
 [test_browserElement_inproc_TargetTop.html]
--- a/dom/devicestorage/ipc/mochitest.ini
+++ b/dom/devicestorage/ipc/mochitest.ini
@@ -1,5 +1,6 @@
 [DEFAULT]
+skip-if = toolkit == 'android' #bug 781789 & bug 782275
 support-files = ../test/devicestorage_common.js
 
 [test_ipc.html]
 skip-if = buildapp == 'b2g' # b2g(nested ipc not working) b2g-debug(nested ipc not working) b2g-desktop(nested ipc not working)
--- a/dom/devicestorage/test/mochitest.ini
+++ b/dom/devicestorage/test/mochitest.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
+skip-if = toolkit == 'android' #bug 781789 & bug 782275
 support-files = devicestorage_common.js
 
 [test_823965.html]
 # [test_add.html]
 # man, our mime database sucks hard.  followup bug # 788273
 [test_addCorrectType.html]
 [test_available.html]
 [test_basic.html]
--- a/dom/imptests/editing/mochitest.ini
+++ b/dom/imptests/editing/mochitest.ini
@@ -5,18 +5,20 @@ support-files =
   css/reset.css
   implementation.js
   selecttest/common.js
   selecttest/test-iframe.html
   tests.js
 
 [conformancetest/test_event.html]
 [conformancetest/test_runtest.html]
+skip-if = toolkit == 'android'
 [selecttest/test_Document-open.html]
 [selecttest/test_addRange.html]
+skip-if = toolkit == 'android' #bug 775227
 [selecttest/test_collapse.html]
 [selecttest/test_collapseToStartEnd.html]
 [selecttest/test_deleteFromDocument.html]
 [selecttest/test_extend.html]
 [selecttest/test_getRangeAt.html]
 [selecttest/test_getSelection.html]
 [selecttest/test_interfaces.html]
 [selecttest/test_isCollapsed.html]
--- a/dom/imptests/html/mochitest.ini
+++ b/dom/imptests/html/mochitest.ini
@@ -266,13 +266,19 @@ skip-if = true # bug 859075
 [js/builtins/test_Array.prototype.join-order.html]
 [js/builtins/test_Math.max.html]
 [js/builtins/test_Math.min.html]
 [js/builtins/test_Object.prototype.hasOwnProperty-order.html]
 [js/builtins/test_WeakMap.prototype-properties.html]
 [microdata/microdata-dom-api/test_001.html]
 [typedarrays/test_constructors.html]
 [webgl/test_bufferSubData.html]
+skip-if = toolkit == 'android' #WebGL
 [webgl/test_compressedTexImage2D.html]
+skip-if = toolkit == 'android' #WebGL
 [webgl/test_compressedTexSubImage2D.html]
+skip-if = toolkit == 'android' #WebGL
 [webgl/test_texImage2D.html]
+skip-if = toolkit == 'android' #WebGL
 [webgl/test_texSubImage2D.html]
+skip-if = toolkit == 'android' #WebGL
 [webgl/test_uniformMatrixNfv.html]
+skip-if = toolkit == 'android' #WebGL
--- a/dom/imptests/webapps/mochitest.ini
+++ b/dom/imptests/webapps/mochitest.ini
@@ -22,16 +22,17 @@ support-files =
 [WebStorage/tests/submissions/Infraware/test_event_session_newvalue.html]
 [WebStorage/tests/submissions/Infraware/test_event_session_oldvalue.html]
 [WebStorage/tests/submissions/Infraware/test_event_session_storagearea.html]
 [WebStorage/tests/submissions/Infraware/test_event_session_storageeventinit.html]
 [WebStorage/tests/submissions/Infraware/test_event_session_url.html]
 [WebStorage/tests/submissions/Infraware/test_storage_local_clear.html]
 [WebStorage/tests/submissions/Infraware/test_storage_local_getitem.html]
 [WebStorage/tests/submissions/Infraware/test_storage_local_key.html]
+skip-if = toolkit == 'android' #bug 775227
 [WebStorage/tests/submissions/Infraware/test_storage_local_length.html]
 [WebStorage/tests/submissions/Infraware/test_storage_local_removeitem.html]
 [WebStorage/tests/submissions/Infraware/test_storage_local_security.html]
 [WebStorage/tests/submissions/Infraware/test_storage_local_setitem.html]
 [WebStorage/tests/submissions/Infraware/test_storage_session_clear.html]
 [WebStorage/tests/submissions/Infraware/test_storage_session_getitem.html]
 [WebStorage/tests/submissions/Infraware/test_storage_session_key.html]
 [WebStorage/tests/submissions/Infraware/test_storage_session_length.html]
--- a/dom/inputmethod/mochitest/mochitest.ini
+++ b/dom/inputmethod/mochitest/mochitest.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
+skip-if = toolkit == 'android' #Not supported on Android
 support-files =
   inputmethod_common.js
   file_inputmethod.html
   file_test_app.html
   file_test_sendkey_cancel.html
 
 [test_basic.html]
 [test_bug944397.html]
--- a/layout/generic/test/mochitest.ini
+++ b/layout/generic/test/mochitest.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
+skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM, ONLY IN CHUNK 10
 support-files =
   ../../reftests/backgrounds/blue-32x32.png
   ../../reftests/backgrounds/fuchsia-32x32.png
   ../../base/tests/enableTestPlugin.js
   plugin_clipping_helper.xhtml
   plugin_clipping_helper2.xhtml
   plugin_clipping_helper_transformed.xhtml
   plugin_clipping_helper_table.xhtml
--- a/testing/mochitest/android.json
+++ b/testing/mochitest/android.json
@@ -1,35 +1,6 @@
 {
 "runtests": {},
 "excludetests": {
-  "content/canvas/test/webgl": "bug 865443- seperate suite - the non_conf* tests pass except for one on armv6 tests",
-  "robocop": "TIMED_OUT",
-  "Harness_sanity/test_bug816847.html": "No test app installed",
-  "dom/imptests/html/webgl": "WebGL",
-  "editor/libeditor/text/tests/test_texteditor_keyevent_handling.html": "",
-  "Harness_sanity/test_sanitySimpletest.html": "bug 688052",
-  "toolkit/content/tests/widgets/test_contextmenu_nested.xul": "",
-  "dom/browser-element/mochitest/test_browserElement_inproc_AppWindowNamespace.html": "TIMED_OUT, bug 783509",
-  "layout/generic": "CRASH_DUMP, RANDOM, ONLY IN CHUNK 10",
-  "dom/browser-element/mochitest/test_browserElement_oop_SecurityChange.html": "TIMED_OUT, bug 766586",
-  "dom/browser-element/mochitest/test_browserElement_inproc_SecurityChange.html": "TIMED_OUT, bug 766586",
-  "content/base/test/test_copypaste.xul": "bug 904183",
-  "content/media/test/test_played.html": "bug 751539",
-  "content/media/test/test_playback_rate.html": "bug 845162",
-  "content/media/test/test_seek.html": "bug 845162",
-  "dom/devicestorage": "bug 781789 & bug 782275",
-  "dom/imptests/editing/conformancetest/test_runtest.html": "",
-  "toolkit/content/tests/widgets/test_menubar.xul": "W/SharedBufferStack(21799): waitForCondition(LockCondition) timed out (identity=34, status=0). CPU may be pegged. trying again",
-  "content/media/test/test_buffered.html": "",
-  "toolkit/components/satchel/test/test_form_autocomplete.html": "TIMED_OUT",
-  "dom/browser-element/mochitest/test_browserElement_inproc_CloseApp.html": "FAILS, bug 796982",
-  "dom/tests/mochitest/geolocation/test_timeoutWatch.html": "TIMED_OUT",
-  "dom/imptests/editing/selecttest/test_addRange.html": "bug 775227",
-  "editor/libeditor/text/tests/test_bug569988.html": "TIMED_OUT",
-  "dom/browser-element/mochitest/test_browserElement_inproc_AppFramePermission.html": "",
-  "toolkit/components/places/tests/test_bug_411966.html": "RANDOM",
-  "dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_key.html": "bug 775227",
-  "toolkit/components/passwordmgr/test/test_privbrowsing_perwindowpb.html": "",
-  "dom/inputmethod": "Not supported on Android",
-  "Harness_sanity/test_sanityEventUtils.html": "bug 688052"
+  "robocop": "TIMED_OUT"
   }
 }
--- a/testing/mochitest/android23.json
+++ b/testing/mochitest/android23.json
@@ -1,41 +1,12 @@
 {
 "runtests": {},
 "excludetests": {
-  "content/canvas/test/webgl": "bug 865443- seperate suite - the non_conf* tests pass except for one on armv6 tests",
   "robocop": "TIMED_OUT",
-  "Harness_sanity/test_bug816847.html": "No test app installed",
-  "dom/imptests/html/webgl": "WebGL",
-  "editor/libeditor/text/tests/test_texteditor_keyevent_handling.html": "",
-  "Harness_sanity/test_sanitySimpletest.html": "bug 688052",
-  "toolkit/content/tests/widgets/test_contextmenu_nested.xul": "",
-  "dom/browser-element/mochitest/test_browserElement_inproc_AppWindowNamespace.html": "TIMED_OUT, bug 783509",
-  "layout/generic": "CRASH_DUMP, RANDOM, ONLY IN CHUNK 10",
-  "dom/browser-element/mochitest/test_browserElement_oop_SecurityChange.html": "TIMED_OUT, bug 766586",
-  "dom/browser-element/mochitest/test_browserElement_inproc_SecurityChange.html": "TIMED_OUT, bug 766586",
-  "content/base/test/test_copypaste.xul": "bug 904183",
-  "content/media/test/test_played.html": "bug 751539",
-  "content/media/test/test_playback_rate.html": "bug 845162",
-  "content/media/test/test_seek.html": "bug 845162",
-  "dom/devicestorage": "bug 781789 & bug 782275",
-  "dom/imptests/editing/conformancetest/test_runtest.html": "",
-  "toolkit/content/tests/widgets/test_menubar.xul": "W/SharedBufferStack(21799): waitForCondition(LockCondition) timed out (identity=34, status=0). CPU may be pegged. trying again",
-  "content/media/test/test_buffered.html": "",
-  "toolkit/components/satchel/test/test_form_autocomplete.html": "TIMED_OUT",
-  "dom/browser-element/mochitest/test_browserElement_inproc_CloseApp.html": "FAILS, bug 796982",
-  "dom/tests/mochitest/geolocation/test_timeoutWatch.html": "TIMED_OUT",
-  "dom/imptests/editing/selecttest/test_addRange.html": "bug 775227",
-  "editor/libeditor/text/tests/test_bug569988.html": "TIMED_OUT",
-  "dom/browser-element/mochitest/test_browserElement_inproc_AppFramePermission.html": "",
-  "toolkit/components/places/tests/test_bug_411966.html": "RANDOM",
-  "dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_key.html": "bug 775227",
-  "toolkit/components/passwordmgr/test/test_privbrowsing_perwindowpb.html": "",
-  "dom/inputmethod": "Not supported on Android",
-  "Harness_sanity/test_sanityEventUtils.html": "bug 688052",
   "content/html/content/test/test_ignoreuserfocus.html": "Android 2.3 only; bug 981895",
   "content/media/test/test_audio_event_adopt.html": "Android 2.3 only; bug 981898",
   "content/media/test/test_autoplay.html": "Android 2.3 only; bug 981898",
   "content/media/test/test_autoplay_contentEditable.html": "Android 2.3 only; bug 981898",
   "content/media/test/test_chaining.html": "Android 2.3 only; bug 981898",
   "content/media/test/test_loop.html": "Android 2.3 only; bug 981898",
   "content/media/test/test_mediarecorder_record_4ch_audiocontext.html": "Android 2.3 only; bug 981898",
   "content/media/test/test_mediarecorder_record_immediate_stop.html": "Android 2.3 only; bug 981898",
--- a/testing/mochitest/androidx86.json
+++ b/testing/mochitest/androidx86.json
@@ -1,120 +1,111 @@
 {
 "runtests": {},
 "excludetests": {
-  "content/canvas/test/webgl": "bug 865443- seperate suite - the non_conf* tests pass except for one on armv6 tests",
-  "dom/imptests/html/webgl": "WebGL",
+  "content/base/test/test_ipc_messagemanager_blob.html": "x86 only bug 936226",
   "content/base/test/test_copypaste.xul": "bug 904183",
-  "toolkit/content/tests/widgets/test_contextmenu_nested.xul": "",
-  "dom/browser-element/mochitest/test_browserElement_inproc_AppWindowNamespace.html": "TIMED_OUT, bug 783509",
-  "layout/generic": "CRASH_DUMP, RANDOM, ONLY IN CHUNK 10",
-  "dom/browser-element/mochitest/test_browserElement_inproc_SecurityChange.html": "TIMED_OUT, bug 766586",
+  "content/canvas/test/test_2d.composite.canvas.luminosity.html": "x86 only bug 913662",
+  "content/canvas/test/test_2d.composite.canvas.source-in.html": "x86 only bug 913662",
+  "content/canvas/test/test_2d.composite.uncovered.image.destination-atop.html": "x86 only bug 913662",
+  "content/canvas/test/test_2d.composite.image.source-in.html": "x86 only bug 913662",
+  "content/canvas/test/webgl": "bug 865443- seperate suite - the non_conf* tests pass except for one on armv6 tests",
+  "content/canvas/test/test_2d.composite.canvas.multiply.html": "x86 only bug 913662",
+  "content/canvas/test/test_2d.composite.canvas.lighten.html": "x86 only bug 913662",
+  "content/canvas/test/test_2d.composite.canvas.color-dodge.html": "x86 only bug 913662",
+  "content/canvas/test/test_2d.composite.canvas.destination-in.html": "x86 only bug 913662",
+  "content/canvas/test/test_2d.composite.canvas.screen.html": "x86 only bug 913662",
+  "content/canvas/test/test_2d.composite.image.source-out.html": "x86 only bug 913662",
+  "content/canvas/test/test_2d.composite.canvas.exclusion.html": "x86 only bug 913662",
+  "content/canvas/test/test_2d.composite.canvas.source-out.html": "x86 only bug 913662",
+  "content/canvas/test/test_2d.composite.canvas.soft-light.html": "x86 only bug 913662",
+  "content/canvas/test/test_2d.composite.canvas.destination-atop.html": "x86 only bug 913662",
+  "content/canvas/test/test_canvas.html": "x86 only bug 913662",
+  "content/canvas/test/test_2d.composite.canvas.overlay.html": "x86 only bug 913662",
+  "content/canvas/test/test_2d.composite.canvas.darken.html": "x86 only bug 913662",
+  "content/canvas/test/test_2d.composite.uncovered.image.source-in.html": "x86 only bug 913662",
+  "content/canvas/test/test_2d.composite.canvas.saturation.html": "x86 only bug 913662",
+  "content/canvas/test/test_2d.composite.image.destination-atop.html": "x86 only bug 913662",
+  "content/canvas/test/test_2d.composite.uncovered.image.source-out.html": "x86 only bug 913662",
+  "content/canvas/test/test_2d.composite.canvas.color.html": "x86 only bug 913662",
+  "content/canvas/test/test_2d.composite.image.destination-in.html": "x86 only bug 913662",
+  "content/canvas/test/test_2d.composite.canvas.hue.html": "x86 only bug 913662",
+  "content/canvas/test/test_2d.composite.canvas.difference.html": "x86 only bug 913662",
+  "content/canvas/test/test_2d.composite.canvas.color-burn.html": "x86 only bug 913662",
+  "content/canvas/test/test_2d.composite.uncovered.image.destination-in.html": "x86 only bug 913662",
+  "content/canvas/test/test_2d.composite.canvas.hard-light.html": "x86 only bug 913662",
+  "content/html/content/test/forms/test_input_textarea_set_value_no_scroll.html": "x86 only",
+  "content/media/test/test_media_selection.html": "x86 only bug 914439",
+  "content/media/test/test_bug495300.html": "x86 only bug 914439",
+  "content/media/test/test_new_audio.html": "x86 only bug 914439",
+  "content/media/test/test_seeked.html": "x86 only bug 914439",
+  "content/media/test/test_played.html": "bug 751539",
+  "content/media/test/test_playback_rate.html": "bug 845162",
+  "content/media/test/test_playback_rate_playpause.html": "x86 only bug 914439",
+  "content/media/test/test_loop.html": "x86 only bug 914439",
+  "content/media/test/test_play_twice.html": "x86 only bug 914439",
+  "content/media/test/test_bug495145.html": "x86 only bug 914439",
+  "content/media/test/test_bug465498.html": "",
+  "content/media/test/test_play_events_2.html": "x86 only bug 914439",
+  "content/media/test/test_media_sniffer.html": "x86 only bug 914439",
+  "content/media/test/test_seek_out_of_range.html": "x86 only bug 914439"
+  "content/media/test/test_load_same_resource.html": "x86 only bug 914439",
+  "content/media/test/test_bug493187.html": "x86 only bug 914439",
+  "content/media/test/test_autoplay_contentEditable.html": "x86 only",
+  "content/media/test/test_audio2.html": "x86 only bug 914439",
+  "content/media/test/test_can_play_type_mpeg.html": "x86 only bug 914439",
+  "content/media/test/test_bug686942.html": "x86 only bug 914439",
+  "content/media/test/test_standalone.html": "x86 only bug 914439",
+  "content/media/test/test_bug448534.html": "x86 only bug 914439",
+  "content/media/test/test_video_to_canvas.html": "x86 only bug 914439",
+  "content/media/test/test_load_candidates.html": "x86 only bug 914439",
+  "content/media/test/test_streams_element_capture_createObjectURL.html": "x86 only bug 914439",
+  "content/media/test/test_progress.html": "x86 only bug 914439",
+  "content/media/test/test_seekable1.html": "timeout x86 only bug 914439",
+  "content/media/test/test_play_events.html": "x86 only bug 914439",
+  "content/media/test/test_reactivate.html": "x86 only bug 914439",
+  "content/media/test/test_referer.html": "x86 only",
+  "content/media/webaudio/test/test_audioBufferSourceNodeNeutered.html": "x86 only",
+  "content/media/test/test_load.html": "x86 only bug 914439",
+  "content/media/test/test_streams_element_capture.html": "x86 only bug 914439",
+  "content/media/test/test_replay_metadata.html": "x86 only bug 914439",
+  "content/media/test/test_unseekable.html": "x86 only",
+  "content/media/test/test_paused_after_ended.html": "x86 only bug 914439",
+  "content/media/test/test_timeupdate_small_files.html": "x86 only bug 914439",
+  "content/media/test/test_playback.html": "x86 only bug 914439",
+  "docshell/test/navigation/test_not-opener.html": "x86 only",
+  "dom/apps/tests/test_packaged_app_update.html": "x86 only",
+  "dom/apps/tests/test_packaged_app_install.html": "x86 only",
+  "dom/browser-element/mochitest/test_browserElement_oop_NextPaint.html": "x86 only bug 936226",
+  "dom/browser-element/mochitest/test_browserElement_inproc_GetScreenshot.html": "x86 only",
+  "dom/browser-element/mochitest/test_browserElement_NoWhitelist.html": "x86 only bug 936226",
   "dom/browser-element/mochitest/test_browserElement_oop_SecurityChange.html": "TIMED_OUT, bug 766586",
-  "content/media/test/test_played.html": "bug 751539",
-  "content/media/test/test_seek.html": "bug 845162",
+  "dom/contacts/tests/test_contacts_getall.html": "x86 only",
+  "dom/datastore/tests/test_oop.html": "x86 only bug 936226",
+  "dom/datastore/tests/test_sync.html": "x86 only bug 936226",
+  "dom/datastore/tests/test_readonly.html": "x86 only bug 936226",
   "dom/devicestorage": "bug 781789 & bug 782275",
+  "dom/imptests/editing/selecttest/test_addRange.html": "bug 775227",
   "dom/imptests/editing/conformancetest/test_runtest.html": "",
-  "toolkit/content/tests/widgets/test_menubar.xul": "W/SharedBufferStack(21799): waitForCondition(LockCondition) timed out (identity=34, status=0). CPU may be pegged. trying again",
-  "content/media/test/test_playback_rate.html": "bug 845162",
-  "content/media/test/test_buffered.html": "",
-  "toolkit/components/satchel/test/test_form_autocomplete.html": "TIMED_OUT",
-  "dom/browser-element/mochitest/test_browserElement_inproc_CloseApp.html": "FAILS, bug 796982",
+  "dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_key.html": "bug 775227",
+  "dom/imptests/html/webgl": "WebGL",
+  "dom/inputmethod": "Not supported on Android",
+  "dom/tests/mochitest/geolocation/test_timeoutWatch.html": "TIMED_OUT",
+  "editor/libeditor/text/tests/test_bug569988.html": "TIMED_OUT",
   "editor/libeditor/text/tests/test_texteditor_keyevent_handling.html": "",
-  "dom/imptests/editing/selecttest/test_addRange.html": "bug 775227",
-  "editor/libeditor/text/tests/test_bug569988.html": "TIMED_OUT",
-  "dom/browser-element/mochitest/test_browserElement_inproc_AppFramePermission.html": "",
-  "toolkit/components/places/tests/test_bug_411966.html": "RANDOM",
-  "dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_key.html": "bug 775227",
-  "toolkit/components/passwordmgr/test/test_privbrowsing_perwindowpb.html": "",
-  "dom/tests/mochitest/geolocation/test_timeoutWatch.html": "TIMED_OUT",
-  "dom/inputmethod": "Not supported on Android",
+  "Harness_sanity/test_sanityWindowSnapshot.html": "x86 only",
+  "image/test/mochitest/test_bug671906.html": "x86 only",
+  "image/test/mochitest/test_bug89419-2.html": "x86 only",
+  "image/test/mochitest/test_bug490949.html": "x86 only",
+  "image/test/mochitest/test_bug497665.html": "x86 only",
+  "image/test/mochitest/test_bug601470.html": "x86 only",
+  "image/test/mochitest/test_bug89419-1.html": "x86 only",
+  "layout/generic": "CRASH_DUMP, RANDOM, ONLY IN CHUNK 10",
+  "MochiKit-1.4.2/tests/test_MochiKit-Async.html": "x86 only",
   "robocop": "TIMED_OUT",
-  "Harness_sanity/test_bug816847.html": "No test app installed",
-  "Harness_sanity/test_sanityEventUtils.html": "bug 688052",
-  "Harness_sanity/test_sanitySimpletest.html": "bug 688052",
- "MochiKit-1.4.2/tests/test_MochiKit-Async.html": "x86 only",
- "content/base/test/test_ipc_messagemanager_blob.html" : "x86 only bug 936226",
- "content/canvas/test/test_2d.composite.canvas.color-burn.html": "x86 only bug 913662",
- "content/canvas/test/test_2d.composite.canvas.color-dodge.html": "x86 only bug 913662",
- "content/canvas/test/test_2d.composite.canvas.color.html": "x86 only bug 913662",
- "content/canvas/test/test_2d.composite.canvas.darken.html": "x86 only bug 913662",
- "content/canvas/test/test_2d.composite.canvas.destination-atop.html": "x86 only bug 913662",
- "content/canvas/test/test_2d.composite.canvas.destination-in.html": "x86 only bug 913662",
- "content/canvas/test/test_2d.composite.canvas.difference.html": "x86 only bug 913662",
- "content/canvas/test/test_2d.composite.canvas.exclusion.html": "x86 only bug 913662",
- "content/canvas/test/test_2d.composite.canvas.hard-light.html": "x86 only bug 913662",
- "content/canvas/test/test_2d.composite.canvas.hue.html": "x86 only bug 913662",
- "content/canvas/test/test_2d.composite.canvas.lighten.html": "x86 only bug 913662",
- "content/canvas/test/test_2d.composite.canvas.luminosity.html": "x86 only bug 913662",
- "content/canvas/test/test_2d.composite.canvas.multiply.html": "x86 only bug 913662",
- "content/canvas/test/test_2d.composite.canvas.overlay.html": "x86 only bug 913662",
- "content/canvas/test/test_2d.composite.canvas.saturation.html": "x86 only bug 913662",
- "content/canvas/test/test_2d.composite.canvas.screen.html": "x86 only bug 913662",
- "content/canvas/test/test_2d.composite.canvas.soft-light.html": "x86 only bug 913662",
- "content/canvas/test/test_2d.composite.canvas.source-in.html": "x86 only bug 913662",
- "content/canvas/test/test_2d.composite.canvas.source-out.html": "x86 only bug 913662",
- "content/canvas/test/test_2d.composite.image.destination-atop.html": "x86 only bug 913662",
- "content/canvas/test/test_2d.composite.image.destination-in.html": "x86 only bug 913662",
- "content/canvas/test/test_2d.composite.image.source-in.html": "x86 only bug 913662",
- "content/canvas/test/test_2d.composite.image.source-out.html": "x86 only bug 913662",
- "content/canvas/test/test_2d.composite.uncovered.image.destination-atop.html": "x86 only bug 913662",
- "content/canvas/test/test_2d.composite.uncovered.image.destination-in.html": "x86 only bug 913662",
- "content/canvas/test/test_2d.composite.uncovered.image.source-in.html": "x86 only bug 913662",
- "content/canvas/test/test_2d.composite.uncovered.image.source-out.html": "x86 only bug 913662",
- "content/canvas/test/test_canvas.html": "x86 only bug 913662",
- "content/html/content/test/forms/test_input_textarea_set_value_no_scroll.html": "x86 only",
- "content/media/test/test_autoplay_contentEditable.html": "x86 only",
- "content/media/test/test_bug465498.html": "",
- "content/media/test/test_bug448534.html": "x86 only bug 914439",
- "content/media/test/test_bug493187.html": "x86 only bug 914439",
- "content/media/test/test_bug495145.html": "x86 only bug 914439",
- "content/media/test/test_bug495300.html": "x86 only bug 914439",
- "content/media/test/test_bug686942.html": "x86 only bug 914439",
- "content/media/test/test_can_play_type_mpeg.html": "x86 only bug 914439",
- "content/media/test/test_audio2.html": "x86 only bug 914439",
- "content/media/test/test_load.html": "x86 only bug 914439",
- "content/media/test/test_load_candidates.html": "x86 only bug 914439",
- "content/media/test/test_load_same_resource.html": "x86 only bug 914439",
- "content/media/test/test_loop.html": "x86 only bug 914439",
- "content/media/test/test_media_selection.html": "x86 only bug 914439",
- "content/media/test/test_media_sniffer.html": "x86 only bug 914439",
- "content/media/test/test_new_audio.html": "x86 only bug 914439",
- "content/media/test/test_paused_after_ended.html": "x86 only bug 914439",
- "content/media/test/test_play_events.html": "x86 only bug 914439",
- "content/media/test/test_play_events_2.html": "x86 only bug 914439",
- "content/media/test/test_play_twice.html": "x86 only bug 914439",
- "content/media/test/test_playback.html": "x86 only bug 914439",
- "content/media/test/test_playback_rate_playpause.html": "x86 only bug 914439",
- "content/media/test/test_progress.html": "x86 only bug 914439",
- "content/media/test/test_reactivate.html": "x86 only bug 914439",
- "content/media/test/test_referer.html": "x86 only",
- "content/media/test/test_replay_metadata.html": "x86 only bug 914439",
- "content/media/test/test_seek_out_of_range.html": "x86 only bug 914439",
- "content/media/test/test_seekable1.html": "timeout x86 only bug 914439",
- "content/media/test/test_seeked.html": "x86 only bug 914439",
- "content/media/test/test_standalone.html": "x86 only bug 914439",
- "content/media/test/test_streams_element_capture.html": "x86 only bug 914439",
- "content/media/test/test_streams_element_capture_createObjectURL.html": "x86 only bug 914439",
- "content/media/test/test_timeupdate_small_files.html": "x86 only bug 914439",
- "content/media/test/test_unseekable.html": "x86 only",
- "content/media/test/test_video_to_canvas.html": "x86 only bug 914439",
- "content/media/webaudio/test/test_audioBufferSourceNodeNeutered.html": "x86 only",
- "docshell/test/navigation/test_not-opener.html": "x86 only",
- "dom/apps/tests/test_packaged_app_install.html": "x86 only",
- "dom/apps/tests/test_packaged_app_update.html": "x86 only",
- "dom/browser-element/mochitest/test_browserElement_inproc_GetScreenshot.html": "x86 only",
- "dom/browser-element/mochitest/test_browserElement_NoWhitelist.html": "x86 only bug 936226",
- "dom/browser-element/mochitest/test_browserElement_oop_NextPaint.html": "x86 only bug 936226",
- "dom/contacts/tests/test_contacts_getall.html": "x86 only",
- "dom/datastore/tests/test_oop.html": "x86 only bug 936226",
- "dom/datastore/tests/test_readonly.html": "x86 only bug 936226",
- "dom/datastore/tests/test_sync.html": "x86 only bug 936226",
- "image/test/mochitest/test_bug490949.html": "x86 only",
- "image/test/mochitest/test_bug497665.html": "x86 only",
- "image/test/mochitest/test_bug601470.html": "x86 only",
- "image/test/mochitest/test_bug671906.html": "x86 only",
- "image/test/mochitest/test_bug89419-1.html": "x86 only",
- "image/test/mochitest/test_bug89419-2.html": "x86 only",
- "toolkit/components/alerts/test/test_alerts_noobserve.html": "x86 only",
- "Harness_sanity/test_sanityWindowSnapshot.html": "x86 only"
- }
+  "toolkit/components/satchel/test/test_form_autocomplete.html": "TIMED_OUT",
+  "toolkit/components/alerts/test/test_alerts_noobserve.html": "x86 only",
+  "toolkit/components/places/tests/test_bug_411966.html": "RANDOM",
+  "toolkit/components/passwordmgr/test/test_privbrowsing_perwindowpb.html": "",
+  "toolkit/content/tests/widgets/test_menubar.xul": "W/SharedBufferStack(21799",
+  "toolkit/content/tests/widgets/test_contextmenu_nested.xul": ""
+  }
 }
--- a/testing/mochitest/tests/Harness_sanity/mochitest.ini
+++ b/testing/mochitest/tests/Harness_sanity/mochitest.ini
@@ -6,13 +6,15 @@
 [test_SpecialPowersExtension2.html]
 support-files = file_SpecialPowersFrame1.html
 [test_SpecialPowersPushPermissions.html]
 [test_SpecialPowersPushPrefEnv.html]
 [test_SimpleTestGetTestFileURL.html]
 [test_SpecialPowersLoadChromeScript.html]
 support-files = SpecialPowersLoadChromeScript.js
 [test_bug816847.html]
+skip-if = toolkit == 'android' #No test app installed
 [test_sanity_cleanup.html]
 [test_sanity_cleanup2.html]
 [test_sanityEventUtils.html]
+skip-if = toolkit == 'android' #bug 688052
 [test_sanitySimpletest.html]
-
+skip-if = toolkit == 'android' #bug 688052