From 183abfaf1201369e9df62c91d11ab5ed746d9e95 Mon Sep 17 00:00:00 2001 From: Andrew McCreight Date: Sat, 31 Oct 2015 06:26:44 -0700 Subject: [PATCH] Bug 1219842 - Enable a bunch of mochitest-plain tests under e10s. r=mrbkap --- .../base/content/test/general/mochitest.ini | 9 +++--- devtools/shared/apps/tests/mochitest.ini | 1 - dom/apps/tests/mochitest.ini | 15 ++++----- dom/base/test/mochitest.ini | 4 +-- dom/broadcastchannel/tests/mochitest.ini | 4 +-- dom/events/test/mochitest.ini | 8 ++--- dom/html/test/mochitest.ini | 2 +- dom/plugins/test/mochitest/mochitest.ini | 5 ++- dom/security/test/csp/mochitest.ini | 4 +-- .../test/mixedcontentblocker/mochitest.ini | 2 +- dom/tests/mochitest/bugs/mochitest.ini | 12 +++---- dom/tests/mochitest/geolocation/mochitest.ini | 4 +-- .../mochitest/sessionstorage/mochitest.ini | 3 +- dom/workers/test/mochitest.ini | 12 +++---- editor/libeditor/tests/mochitest.ini | 32 +++++++++---------- embedding/test/mochitest.ini | 2 +- layout/base/tests/mochitest.ini | 4 +-- layout/generic/test/mochitest.ini | 2 +- .../htmlparser/tests/mochitest/mochitest.ini | 2 +- toolkit/modules/tests/mochitest/mochitest.ini | 1 - 20 files changed, 61 insertions(+), 67 deletions(-) diff --git a/browser/base/content/test/general/mochitest.ini b/browser/base/content/test/general/mochitest.ini index 139133ecdf4..508642da77b 100644 --- a/browser/base/content/test/general/mochitest.ini +++ b/browser/base/content/test/general/mochitest.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' || e10s +skip-if = buildapp == 'b2g' support-files = audio.ogg bug364677-data.xml @@ -31,9 +31,10 @@ support-files = [test_contextmenu.html] skip-if = toolkit == "gtk2" || toolkit == "gtk3" || (os == 'mac' && os_version != '10.6') # disabled on Linux due to bug 513558, on Mac after 10.6 due to bug 792304 [test_contextmenu_input.html] -skip-if = toolkit == "gtk2" || toolkit == "gtk3" # disabled on Linux due to bug 513558 +skip-if = toolkit == "gtk2" || toolkit == "gtk3" || e10s # disabled on Linux due to bug 513558 [test_feed_discovery.html] +skip-if = e10s [test_offlineNotification.html] -skip-if = buildapp == 'mulet' # Bug 1066070 - I don't think either popup notifications nor addon install stuff works? +skip-if = buildapp == 'mulet' || e10s # Bug 1066070 - I don't think either popup notifications nor addon install stuff works? [test_offline_gzip.html] -skip-if = buildapp == 'mulet' # Bug 1066070 - I don't think either popup notifications nor addon install stuff works? +skip-if = buildapp == 'mulet' || e10s # Bug 1066070 - I don't think either popup notifications nor addon install stuff works? diff --git a/devtools/shared/apps/tests/mochitest.ini b/devtools/shared/apps/tests/mochitest.ini index d640516174d..a4c35a147b4 100644 --- a/devtools/shared/apps/tests/mochitest.ini +++ b/devtools/shared/apps/tests/mochitest.ini @@ -1,5 +1,4 @@ [DEFAULT] -skip-if = e10s support-files = debugger-protocol-helper.js redirect.sjs diff --git a/dom/apps/tests/mochitest.ini b/dom/apps/tests/mochitest.ini index 61779d11da4..dc604bfc9a6 100644 --- a/dom/apps/tests/mochitest.ini +++ b/dom/apps/tests/mochitest.ini @@ -1,5 +1,4 @@ [DEFAULT] -skip-if = e10s support-files = addons/application.zip addons/invalid.webapp @@ -38,21 +37,21 @@ support-files = icon48.png [test_app_addons.html] -skip-if = os == "android" || toolkit == "gonk" # embed-apps doesn't work in mochitest app +skip-if = os == "android" || toolkit == "gonk" || e10s # embed-apps doesn't work in mochitest app [test_app_blocklist.html] skip-if = buildapp != 'mulet' # we need MOZ_B2G defined and the test to run in the parent process. [test_app_enabled.html] [test_app_update.html] -skip-if = os == "android" || toolkit == "gonk" # embed-apps doesn't work in mochitest app +skip-if = os == "android" || toolkit == "gonk" || e10s # embed-apps doesn't work in mochitest app [test_bug_795164.html] [test_bug_1168300.html] -skip-if = toolkit == "gonk" # see bug 1175784 +skip-if = toolkit == "gonk" || e10s # see bug 1175784 [test_import_export.html] [test_install_dev_mode.html] [test_install_multiple_apps_origin.html] [test_install_receipts.html] [test_langpacks.html] -skip-if = os == "android" || toolkit == "gonk" # embed-apps doesn't work in mochitest app +skip-if = os == "android" || toolkit == "gonk" || e10s # embed-apps doesn't work in mochitest app [test_marketplace_pkg_install.html] skip-if = buildapp == "b2g" || toolkit == "android" # see bug 989806 [test_packaged_app_install.html] @@ -64,10 +63,10 @@ skip-if = (toolkit == 'android' && processor == 'x86') #x86 only [test_uninstall_errors.html] [test_theme_role.html] [test_third_party_homescreen.html] -skip-if = os == "android" || toolkit == "gonk" # embed-apps doesn't work in mochitest app +skip-if = os == "android" || toolkit == "gonk" || e10s # embed-apps doesn't work in mochitest app [test_web_app_install.html] [test_widget.html] -skip-if = os == "android" || toolkit == "gonk" # embed-apps doesn't work in mochitest app +skip-if = os == "android" || toolkit == "gonk" || e10s # embed-apps doesn't work in mochitest app [test_widget_browser.html] -skip-if = os == "android" || toolkit == "gonk" # embed-apps doesn't work in mochitest app +skip-if = os == "android" || toolkit == "gonk" || e10s # embed-apps doesn't work in mochitest app [test_checkInstalled.html] diff --git a/dom/base/test/mochitest.ini b/dom/base/test/mochitest.ini index eeda01a5608..c99fe0cfe7d 100644 --- a/dom/base/test/mochitest.ini +++ b/dom/base/test/mochitest.ini @@ -387,7 +387,7 @@ support-files = test_XHR_timeout.js [test_blobconstructor.html] [test_blob_fragment_and_query.html] [test_bug166235.html] -skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(clipboard undefined) b2g-debug(clipboard undefined) b2g-desktop(clipboard undefined) +skip-if = buildapp == 'b2g' || toolkit == 'android' # b2g(clipboard undefined) b2g-debug(clipboard undefined) b2g-desktop(clipboard undefined) [test_bug199959.html] [test_bug218236.html] [test_bug218277.html] @@ -829,7 +829,7 @@ support-files = file_bug1011748_redirect.sjs file_bug1011748_OK.sjs [test_user_select.html] skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' [test_bug1081686.html] -skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s +skip-if = buildapp == 'b2g' || toolkit == 'android' [test_window_define_nonconfigurable.html] skip-if = release_build [test_root_iframe.html] diff --git a/dom/broadcastchannel/tests/mochitest.ini b/dom/broadcastchannel/tests/mochitest.ini index f37dd65305f..96c39e946f4 100644 --- a/dom/broadcastchannel/tests/mochitest.ini +++ b/dom/broadcastchannel/tests/mochitest.ini @@ -20,7 +20,7 @@ support-files = [test_broadcastchannel_worker.html] [test_broadcastchannel_worker_alive.html] [test_broadcastchannel_mozbrowser.html] -skip-if = e10s || buildapp == 'b2g' +skip-if = buildapp == 'b2g' [test_broadcastchannel_mozbrowser2.html] -skip-if = e10s || buildapp == 'b2g' +skip-if = buildapp == 'b2g' [test_bfcache.html] diff --git a/dom/events/test/mochitest.ini b/dom/events/test/mochitest.ini index 8f98cd9ca7e..e174e55068a 100644 --- a/dom/events/test/mochitest.ini +++ b/dom/events/test/mochitest.ini @@ -26,7 +26,7 @@ skip-if = buildapp == 'b2g' [test_bug1037990.html] [test_bug299673-2.html] [test_bug322588.html] -skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || e10s #Bug 931116, b2g desktop specific, initial triage +skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage [test_bug328885.html] [test_bug336682_1.html] support-files = test_bug336682.js @@ -43,7 +43,7 @@ skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT # Sometimes fails to finish after tests pass on 'B2G ICS Emulator'. skip-if = (os == 'b2g') [test_bug422132.html] -skip-if = buildapp == 'b2g' || e10s # b2g(2 failures out of 8, mousewheel test) b2g-debug(2 failures out of 8, mousewheel test) b2g-desktop(2 failures out of 8, mousewheel test) +skip-if = buildapp == 'b2g' # b2g(2 failures out of 8, mousewheel test) b2g-debug(2 failures out of 8, mousewheel test) b2g-desktop(2 failures out of 8, mousewheel test) [test_bug426082.html] skip-if = buildapp == 'mulet' || buildapp == 'b2g' || os == "win" || toolkit == 'android' || e10s # Intermittent failures, bug 921693 # b2g(1 failure out of 6, Moving the mouse down from the label should have unpressed the button) b2g-debug(1 failure out of 6, Moving the mouse down from the label should have unpressed the button) b2g-desktop(1 failure out of 6, Moving the mouse down from the label should have unpressed the button) [test_bug427537.html] @@ -64,7 +64,7 @@ skip-if = buildapp == 'mulet' || (buildapp == 'b2g' && toolkit != 'gonk') #Bug 9 [test_bug502818.html] skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM [test_bug508479.html] -skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s #CRASH_DUMP, RANDOM # b2g(drag event, also fails on Android) b2g-debug(drag event, also fails on Android) b2g-desktop(drag event, also fails on Android) +skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' #CRASH_DUMP, RANDOM # b2g(drag event, also fails on Android) b2g-debug(drag event, also fails on Android) b2g-desktop(drag event, also fails on Android) [test_bug822898.html] [test_bug517851.html] [test_bug534833.html] @@ -137,7 +137,7 @@ skip-if = buildapp == 'mulet' || buildapp == 'b2g' # b2g(failing when the test g [test_bug946632.html] skip-if = buildapp == 'b2g' [test_bug967796.html] -skip-if = toolkit == "gonk" || e10s +skip-if = toolkit == "gonk" [test_bug985988.html] [test_bug998809.html] [test_bug1017086_disable.html] diff --git a/dom/html/test/mochitest.ini b/dom/html/test/mochitest.ini index d3284a62365..7cb7c339735 100644 --- a/dom/html/test/mochitest.ini +++ b/dom/html/test/mochitest.ini @@ -535,7 +535,7 @@ skip-if = toolkit == 'android' || (toolkit == 'gonk' && debug) #bug 871015, bug [test_bug196523.html] skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage [test_bug199692.html] -skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || toolkit == 'android' || e10s #bug 811644 #Bug 931116, b2g desktop specific, initial triage +skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || toolkit == 'android' #bug 811644 #Bug 931116, b2g desktop specific, initial triage [test_bug172261.html] [test_bug255820.html] [test_bug259332.html] diff --git a/dom/plugins/test/mochitest/mochitest.ini b/dom/plugins/test/mochitest/mochitest.ini index 8d09e95d26a..3f88e8f6fe3 100644 --- a/dom/plugins/test/mochitest/mochitest.ini +++ b/dom/plugins/test/mochitest/mochitest.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = ((buildapp == 'mulet' || buildapp == 'b2g') && toolkit != 'gonk') || (e10s && debug) #b2g-desktop(tests that use plugins) +skip-if = ((buildapp == 'mulet' || buildapp == 'b2g') && toolkit != 'gonk') #b2g-desktop(tests that use plugins) support-files = 307-xo-redirect.sjs crashing_subpage.html @@ -41,7 +41,6 @@ support-files = [test_bug985859.html] [test_bug986930.html] [test_bug1092842.html] -skip-if = e10s [test_cocoa_focus.html] skip-if = toolkit != "cocoa" || e10s # Bug 1194534 support-files = cocoa_focus.html @@ -94,6 +93,7 @@ skip-if = true # Bug 596491 [test_pluginstream_geturl.html] [test_pluginstream_geturlnotify.html] [test_pluginstream_newstream.html] +skip-if = (e10s && debug) [test_pluginstream_post.html] [test_pluginstream_poststream.html] [test_pluginstream_referer.html] @@ -111,7 +111,6 @@ skip-if = toolkit != "cocoa" [test_secondPlugin.html] [test_src_url_change.html] [test_streamNotify.html] -skip-if = e10s [test_stringHandling.html] [test_streamatclose.html] [test_twostreams.html] diff --git a/dom/security/test/csp/mochitest.ini b/dom/security/test/csp/mochitest.ini index 2f1885c53a1..5ba79dd5d61 100644 --- a/dom/security/test/csp/mochitest.ini +++ b/dom/security/test/csp/mochitest.ini @@ -158,9 +158,9 @@ skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) || toolkit == 'and [test_nonce_source.html] [test_bug941404.html] [test_form-action.html] -skip-if = e10s || buildapp == 'b2g' # http-on-opening-request observers are not available in child processes +skip-if = buildapp == 'b2g' # http-on-opening-request observers are not available in child processes [test_hash_source.html] -skip-if = e10s || buildapp == 'b2g' # can't compute hashes in child process (bug 958702) +skip-if = buildapp == 'b2g' # can't compute hashes in child process (bug 958702) [test_scheme_relative_sources.html] skip-if = buildapp == 'b2g' #no ssl support [test_ignore_unsafe_inline.html] diff --git a/dom/security/test/mixedcontentblocker/mochitest.ini b/dom/security/test/mixedcontentblocker/mochitest.ini index f2595e85697..a14dcef5c43 100644 --- a/dom/security/test/mixedcontentblocker/mochitest.ini +++ b/dom/security/test/mixedcontentblocker/mochitest.ini @@ -18,4 +18,4 @@ skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e1 [test_bug803225.html] skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT, SSL_REQUIRED # Bug 1141029 Mulet parity with B2G Desktop for TC [test_frameNavigation.html] -skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT, SSL_REQUIRED # Bug 1141029 Mulet parity with B2G Desktop for TC +skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT, SSL_REQUIRED # Bug 1141029 Mulet parity with B2G Desktop for TC diff --git a/dom/tests/mochitest/bugs/mochitest.ini b/dom/tests/mochitest/bugs/mochitest.ini index 4495ec4fe1f..9967973df5b 100644 --- a/dom/tests/mochitest/bugs/mochitest.ini +++ b/dom/tests/mochitest/bugs/mochitest.ini @@ -40,7 +40,7 @@ support-files = [test_bug260264.html] skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(dom.disable_open_during_load not implemented in b2g) b2g-debug(dom.disable_open_during_load not implemented in b2g) b2g-desktop(dom.disable_open_during_load not implemented in b2g) [test_bug260264_nested.html] -skip-if = buildapp == 'b2g' || e10s # b2g(dom.disable_open_during_load not implemented in b2g) b2g-debug(dom.disable_open_during_load not implemented in b2g) b2g-desktop(dom.disable_open_during_load not implemented in b2g) +skip-if = buildapp == 'b2g' # b2g(dom.disable_open_during_load not implemented in b2g) b2g-debug(dom.disable_open_during_load not implemented in b2g) b2g-desktop(dom.disable_open_during_load not implemented in b2g) [test_bug265203.html] [test_bug291377.html] [test_bug291653.html] @@ -56,7 +56,7 @@ skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) [test_bug346659.html] [test_bug351601.html] [test_bug369306.html] -skip-if = buildapp == 'mulet' || (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) || toolkit == 'android' || e10s #TIMED_OUT # b2g-debug(test timed out, can't focus back from popup window to opener?) b2g-desktop(test timed out, can't focus back from popup window to opener?) +skip-if = buildapp == 'mulet' || (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) || toolkit == 'android' #TIMED_OUT # b2g-debug(test timed out, can't focus back from popup window to opener?) b2g-desktop(test timed out, can't focus back from popup window to opener?) [test_bug370098.html] [test_bug377539.html] [test_bug384122.html] @@ -75,7 +75,7 @@ skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e1 [test_bug414291.html] skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(showmodaldialog) b2g-debug(showmodaldialog) b2g-desktop(showmodaldialog) [test_bug427744.html] -skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s +skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' [test_bug42976.html] [test_bug430276.html] [test_bug437361.html] @@ -113,7 +113,7 @@ skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop spec [test_bug593174.html] skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage [test_bug597809.html] -skip-if = toolkit == 'android' || e10s +skip-if = toolkit == 'android' [test_bug61098.html] skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(showmodaldialog) b2g-debug(showmodaldialog) b2g-desktop(showmodaldialog) [test_bug612267.html] @@ -123,7 +123,7 @@ skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e1 skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage [test_bug633133.html] [test_bug641552.html] -skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) || toolkit == 'android' || e10s +skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) || toolkit == 'android' [test_bug642026.html] [test_bug648465.html] skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage @@ -152,7 +152,7 @@ skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop spec [test_bug876098.html] [test_bug927901.html] [test_devicemotion_multiple_listeners.html] -skip-if = toolkit == 'android' || e10s #bug 775227 +skip-if = toolkit == 'android' #bug 775227 [test_domparser_after_blank.html] [test_errorReporting.html] [test_onerror_message.html] diff --git a/dom/tests/mochitest/geolocation/mochitest.ini b/dom/tests/mochitest/geolocation/mochitest.ini index ba563f82e75..e2c339b8eb3 100644 --- a/dom/tests/mochitest/geolocation/mochitest.ini +++ b/dom/tests/mochitest/geolocation/mochitest.ini @@ -10,7 +10,7 @@ skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT # b2g(Bug 910235 [test_allowWatch.html] skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT [test_cachedPosition.html] -skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT +skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT [test_cancelCurrent.html] skip-if = buildapp == 'b2g' [test_cancelWatch.html] @@ -22,7 +22,7 @@ skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT [test_clearWatch_invalid.html] skip-if = buildapp == 'b2g' [test_errorcheck.html] -skip-if = toolkit=='gonk' || toolkit == 'android' || e10s #TIMED_OUT # b2g-debug(debug-only timeout) +skip-if = toolkit=='gonk' || toolkit == 'android' #TIMED_OUT # b2g-debug(debug-only timeout) [test_geolocation_is_undefined_when_pref_is_off.html] [test_handlerSpinsEventLoop.html] skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s #Don't run modal tests on Android # b2g(showmodaldialog) b2g-debug(showmodaldialog) b2g-desktop(showmodaldialog) diff --git a/dom/tests/mochitest/sessionstorage/mochitest.ini b/dom/tests/mochitest/sessionstorage/mochitest.ini index 019dd1fd4c6..3d98fb170ff 100644 --- a/dom/tests/mochitest/sessionstorage/mochitest.ini +++ b/dom/tests/mochitest/sessionstorage/mochitest.ini @@ -1,5 +1,4 @@ [DEFAULT] -skip-if = e10s support-files = file_http.html file_https.html @@ -12,7 +11,7 @@ support-files = [test_cookieSession.html] skip-if = buildapp == 'b2g' # b2g(4 failures) [test_sessionStorageBase.html] -skip-if = buildapp == 'b2g' # b2g(no storage chrome event received) +skip-if = buildapp == 'b2g' || e10s # b2g(no storage chrome event received) [test_sessionStorageBaseSessionOnly.html] skip-if = buildapp == 'b2g' # b2g(bug 967737) [test_sessionStorageClone.html] diff --git a/dom/workers/test/mochitest.ini b/dom/workers/test/mochitest.ini index 7aaa92f3ae3..56f90d45714 100644 --- a/dom/workers/test/mochitest.ini +++ b/dom/workers/test/mochitest.ini @@ -200,13 +200,13 @@ skip-if = buildapp == 'b2g' || e10s # b2g(test timed out, might need more time) [test_urlApi.html] [test_urlSearchParams.html] [test_websocket.html] -skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #bug 982828 +skip-if = buildapp == 'b2g' || toolkit == 'android' #bug 982828 [test_websocket_basic.html] -skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #bug 982828 +skip-if = buildapp == 'b2g' || toolkit == 'android' #bug 982828 [test_websocket_loadgroup.html] -skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #bug 982828 +skip-if = buildapp == 'b2g' || toolkit == 'android' #bug 982828 [test_webSocket_sharedWorker.html] -skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #bug 982828 +skip-if = buildapp == 'b2g' || toolkit == 'android' #bug 982828 [test_worker_interfaces.html] [test_worker_performance_now.html] [test_workersDisabled.html] @@ -218,9 +218,9 @@ skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #bug 982828 skip-if = buildapp == 'b2g' || e10s [test_xhr_responseURL.html] [test_xhr_system.html] -skip-if = buildapp == 'b2g' || e10s +skip-if = buildapp == 'b2g' [test_xhr_timeout.html] -skip-if = (os == "win") || (os == "mac") || toolkit == 'android' || e10s #bug 798220 +skip-if = (os == "win") || (os == "mac") || toolkit == 'android' #bug 798220 [test_xhrAbort.html] [test_referrer.html] [test_sharedWorker_ports.html] diff --git a/editor/libeditor/tests/mochitest.ini b/editor/libeditor/tests/mochitest.ini index 7bb4d33dce0..2e34a3b8fe4 100644 --- a/editor/libeditor/tests/mochitest.ini +++ b/editor/libeditor/tests/mochitest.ini @@ -30,12 +30,12 @@ skip-if = toolkit == 'android' [test_bug408231.html] skip-if = toolkit == 'android' [test_bug410986.html] -skip-if = toolkit == 'android' || e10s +skip-if = toolkit == 'android' [test_bug414526.html] [test_bug417418.html] skip-if = android_version == '18' # bug 1147989 [test_bug432225.html] -skip-if = toolkit == 'android' || e10s +skip-if = toolkit == 'android' [test_bug439808.html] [test_bug442186.html] [test_bug449243.html] @@ -45,24 +45,24 @@ skip-if = toolkit == 'android' || e10s [test_bug468353.html] [test_bug471722.html] [test_bug478725.html] -skip-if = toolkit == 'android' || e10s +skip-if = toolkit == 'android' [test_bug480647.html] [test_bug480972.html] -skip-if = toolkit == 'android' || e10s +skip-if = toolkit == 'android' [test_bug484181.html] -skip-if = toolkit == 'android' || e10s +skip-if = toolkit == 'android' [test_bug487524.html] [test_bug502673.html] [test_bug514156.html] [test_bug520189.html] -skip-if = toolkit == 'android' || e10s +skip-if = toolkit == 'android' [test_bug525389.html] -skip-if = toolkit == 'android' || e10s +skip-if = toolkit == 'android' [test_bug527935.html] skip-if = toolkit == 'android' || e10s [test_bug537046.html] [test_bug549262.html] -skip-if = toolkit == 'android' || e10s +skip-if = toolkit == 'android' [test_bug550434.html] skip-if = android_version == '18' # bug 1147989 [test_bug551704.html] @@ -72,19 +72,19 @@ skip-if = android_version == '18' # bug 1147989 [test_bug578771.html] skip-if = android_version == '18' # bug 1147989 [test_bug586662.html] -skip-if = toolkit == 'android' || e10s +skip-if = toolkit == 'android' [test_bug587461.html] [test_bug590554.html] [test_bug592592.html] [test_bug596001.html] [test_bug596333.html] -skip-if = toolkit == 'android' || e10s +skip-if = toolkit == 'android' [test_bug596506.html] [test_bug597331.html] skip-if = buildapp == 'mulet' [test_bug597784.html] [test_bug599322.html] -skip-if = toolkit == 'android' || e10s +skip-if = toolkit == 'android' [test_bug599983.html] [test_bug600570.html] skip-if = toolkit == 'android' @@ -107,14 +107,14 @@ skip-if = toolkit == 'android' || e10s [test_bug629845.html] [test_bug638596.html] [test_bug640321.html] -skip-if = android_version == '18' || e10s # bug 1147989 +skip-if = android_version == '18' # bug 1147989 [test_bug641466.html] [test_bug645914.html] [test_bug668599.html] [test_bug674770-1.html] -skip-if = toolkit == 'android' || e10s +skip-if = toolkit == 'android' [test_bug674770-2.html] -skip-if = toolkit == 'android' || e10s +skip-if = toolkit == 'android' [test_bug674861.html] [test_bug676401.html] [test_bug677752.html] @@ -141,7 +141,7 @@ skip-if = toolkit == 'android' || e10s [test_bug857487.html] [test_bug858918.html] [test_bug915962.html] -skip-if = toolkit == 'android' || e10s +skip-if = toolkit == 'android' [test_bug966155.html] skip-if = os != "win" [test_bug966552.html] @@ -150,7 +150,6 @@ skip-if = os != "win" [test_bug1026397.html] [test_bug1067255.html] [test_bug1094000.html] -skip-if = e10s [test_CF_HTML_clipboard.html] [test_contenteditable_focus.html] [test_dom_input_event_on_htmleditor.html] @@ -159,7 +158,6 @@ skip-if = toolkit == 'android' # bug 1054087 [test_keypress_untrusted_event.html] [test_root_element_replacement.html] [test_select_all_without_body.html] -skip-if = e10s [test_spellcheck_pref.html] skip-if = toolkit == 'android' [test_bug1068979.html] diff --git a/embedding/test/mochitest.ini b/embedding/test/mochitest.ini index bc1df2ae830..5d5fbc8423e 100644 --- a/embedding/test/mochitest.ini +++ b/embedding/test/mochitest.ini @@ -9,6 +9,6 @@ support-files = [test_private_window_from_content.html] # Next two tests are disabled in e10s because of bug 989501. [test_window_open_position_constraint.html] -skip-if = toolkit == 'android' || e10s || buildapp == 'mulet' +skip-if = toolkit == 'android' || buildapp == 'mulet' [test_window_open_units.html] skip-if = toolkit == 'android' || e10s || buildapp == 'mulet' diff --git a/layout/base/tests/mochitest.ini b/layout/base/tests/mochitest.ini index 474b3cecbdb..67679e77afa 100644 --- a/layout/base/tests/mochitest.ini +++ b/layout/base/tests/mochitest.ini @@ -167,7 +167,7 @@ support-files = [test_bug582181-2.html] [test_bug588174.html] [test_bug607529.html] -skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || e10s #Bug 931116, b2g desktop specific, initial triage +skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage support-files = file_bug607529.html [test_bug667512.html] [test_bug677878.html] @@ -190,7 +190,7 @@ support-files = bug583889_inner1.html bug583889_inner2.html [test_bug968148.html] support-files = bug968148_inner.html [test_bug603550.html] -skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT # b2g(Components.classes[@mozilla.org/widget/dragservice;1] is undefined) b2g-debug(Components.classes[@mozilla.org/widget/dragservice;1] is undefined) b2g-desktop(Components.classes[@mozilla.org/widget/dragservice;1] is undefined) +skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT # b2g(Components.classes[@mozilla.org/widget/dragservice;1] is undefined) b2g-debug(Components.classes[@mozilla.org/widget/dragservice;1] is undefined) b2g-desktop(Components.classes[@mozilla.org/widget/dragservice;1] is undefined) [test_bug629838.html] skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(depends on plugins support) b2g-debug(depends on plugins support) b2g-desktop(depends on plugins support) [test_bug646757.html] diff --git a/layout/generic/test/mochitest.ini b/layout/generic/test/mochitest.ini index df603378b56..12b25224b9d 100644 --- a/layout/generic/test/mochitest.ini +++ b/layout/generic/test/mochitest.ini @@ -100,7 +100,7 @@ skip-if = buildapp == 'b2g' # b2g(Target should not have scrolled - got 114.1000 [test_bug1062406.html] [test_bug1174521.html] [test_contained_plugin_transplant.html] -skip-if = os=='win' || e10s +skip-if = os=='win' [test_image_selection.html] [test_image_selection_2.html] [test_invalidate_during_plugin_paint.html] diff --git a/parser/htmlparser/tests/mochitest/mochitest.ini b/parser/htmlparser/tests/mochitest/mochitest.ini index 3f1a7b7a1b1..fd8f652a87b 100644 --- a/parser/htmlparser/tests/mochitest/mochitest.ini +++ b/parser/htmlparser/tests/mochitest/mochitest.ini @@ -138,7 +138,7 @@ support-files = [test_html5_tree_construction.html] skip-if = toolkit == 'android' #TIMED_OUT [test_html5_tree_construction_part2.html] -skip-if = toolkit == 'android' || e10s #TIMED_OUT +skip-if = toolkit == 'android' #TIMED_OUT [test_img_picture_preload.html] [test_viewsource.html] [test_xml_mislabeled.html] diff --git a/toolkit/modules/tests/mochitest/mochitest.ini b/toolkit/modules/tests/mochitest/mochitest.ini index 18959e7ef16..a5a7623ac3e 100644 --- a/toolkit/modules/tests/mochitest/mochitest.ini +++ b/toolkit/modules/tests/mochitest/mochitest.ini @@ -1,4 +1,3 @@ [DEFAULT] skip-if = buildapp == 'b2g' [test_spatial_navigation.html] -skip-if = e10s \ No newline at end of file