No bug - Re-enable some more tests that were disabled on e10s without a tracking bug. a=test-only
authorRyan VanderMeulen <ryanvm@gmail.com>
Mon, 25 Apr 2016 21:45:46 -0400
changeset 332614 97d8f62804ce2a75649855d833e27c46fd8377c3
parent 332613 eb158df87111a35aac428c0239ec7567bb92074b
child 332615 2545c54d540ee002c2366ed01e4233d98614298d
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstest-only
milestone48.0a2
No bug - Re-enable some more tests that were disabled on e10s without a tracking bug. a=test-only
devtools/client/framework/test/browser.ini
devtools/client/inspector/markup/test/browser.ini
devtools/client/shadereditor/test/browser.ini
dom/canvas/test/webgl-conformance/mochitest-errata.ini
widget/tests/mochitest.ini
--- a/devtools/client/framework/test/browser.ini
+++ b/devtools/client/framework/test/browser.ini
@@ -75,11 +75,10 @@ skip-if = e10s # Bug 1069044 - destroyIn
 [browser_toolbox_view_source_04.js]
 [browser_toolbox_window_reload_target.js]
 [browser_toolbox_window_shortcuts.js]
 skip-if = os == "mac" && os_version == "10.8" || os == "win" && os_version == "5.1" # Bug 851129 - Re-enable browser_toolbox_window_shortcuts.js test after leaks are fixed
 [browser_toolbox_window_title_changes.js]
 [browser_toolbox_window_title_frame_select.js]
 [browser_toolbox_zoom.js]
 [browser_two_tabs.js]
-skip-if = e10s && debug && os == 'win' # Bug 1231869
 # We want this test to run for mochitest-dt as well, so we include it here:
 [../../../../browser/base/content/test/general/browser_parsable_css.js]
--- a/devtools/client/inspector/markup/test/browser.ini
+++ b/devtools/client/inspector/markup/test/browser.ini
@@ -50,37 +50,36 @@ support-files =
 [browser_markup_anonymous_02.js]
 skip-if = e10s # scratchpad.xul is not loading in e10s window
 [browser_markup_anonymous_03.js]
 [browser_markup_anonymous_04.js]
 [browser_markup_copy_image_data.js]
 [browser_markup_css_completion_style_attribute_01.js]
 [browser_markup_css_completion_style_attribute_02.js]
 [browser_markup_dragdrop_autoscroll.js]
-skip-if = e10s && os == 'win'
 [browser_markup_dragdrop_distance.js]
 [browser_markup_dragdrop_draggable.js]
 [browser_markup_dragdrop_dragRootNode.js]
 [browser_markup_dragdrop_escapeKeyPress.js]
 [browser_markup_dragdrop_invalidNodes.js]
 [browser_markup_dragdrop_reorder.js]
 [browser_markup_dragdrop_tooltip.js]
 [browser_markup_events.js]
 [browser_markup_events_form.js]
-# [browser_markup_events-overflow.js]
-# disabled - See bug 1177550
 [browser_markup_events_jquery_1.0.js]
 [browser_markup_events_jquery_1.1.js]
 [browser_markup_events_jquery_1.2.js]
 [browser_markup_events_jquery_1.3.js]
 [browser_markup_events_jquery_1.4.js]
 [browser_markup_events_jquery_1.6.js]
 [browser_markup_events_jquery_1.7.js]
 [browser_markup_events_jquery_1.11.1.js]
 [browser_markup_events_jquery_2.1.1.js]
+[browser_markup_events-overflow.js]
+skip-if = true # Bug 1177550
 [browser_markup_links_01.js]
 [browser_markup_links_02.js]
 [browser_markup_links_03.js]
 [browser_markup_links_04.js]
 [browser_markup_links_05.js]
 [browser_markup_links_06.js]
 [browser_markup_links_07.js]
 [browser_markup_load_01.js]
--- a/devtools/client/shadereditor/test/browser.ini
+++ b/devtools/client/shadereditor/test/browser.ini
@@ -29,31 +29,19 @@ skip-if = true # Bug 942473, caused by B
 [browser_se_shaders-edit-03.js]
 [browser_webgl-actor-test-01.js]
 [browser_webgl-actor-test-02.js]
 [browser_webgl-actor-test-03.js]
 [browser_webgl-actor-test-04.js]
 [browser_webgl-actor-test-05.js]
 [browser_webgl-actor-test-06.js]
 [browser_webgl-actor-test-07.js]
-skip-if = e10s && os == 'win'
 [browser_webgl-actor-test-08.js]
-skip-if = e10s && os == 'win'
 [browser_webgl-actor-test-09.js]
-skip-if = e10s && os == 'win'
 [browser_webgl-actor-test-10.js]
-skip-if = e10s && os == 'win'
 [browser_webgl-actor-test-11.js]
-skip-if = e10s && os == 'win'
 [browser_webgl-actor-test-12.js]
-skip-if = e10s && os == 'win'
 [browser_webgl-actor-test-13.js]
-skip-if = e10s && os == 'win'
 [browser_webgl-actor-test-14.js]
-skip-if = e10s && os == 'win'
 [browser_webgl-actor-test-15.js]
-skip-if = e10s && os == 'win'
 [browser_webgl-actor-test-16.js]
-skip-if = e10s && os == 'win'
 [browser_webgl-actor-test-17.js]
-skip-if = e10s && os == 'win'
 [browser_webgl-actor-test-18.js]
-skip-if = e10s && os == 'win'
--- a/dom/canvas/test/webgl-conformance/mochitest-errata.ini
+++ b/dom/canvas/test/webgl-conformance/mochitest-errata.ini
@@ -1,22 +1,19 @@
 # *** WARNING! ***
 # Modification to this file only take effect after running
 # generate-wrappers-and-manifest.py
 
 # See python/mozbuild/mozbuild/mozinfo.py for incoming data.
 
 [DEFAULT]
 subsuite = webgl
-# No e10s yet.
-# 'B2G Desktop Linux' fails to create WebGL contexts.
-# Also skip B2G for now, until we get a handle on the longer tail of emulator
-# bugs.
-# Bug 1136181 disabled on B2G Desktop and Mulet for intermittent failures
-skip-if = e10s || os == 'b2g' || ((os == 'linux') && (buildapp == 'b2g')) || ((os == 'linux') && (buildapp == 'mulet'))
+# Skip B2G for now, until we get a handle on the longer tail of emulator bugs.
+# Bug 1136181 disabled on Mulet for intermittent failures
+skip-if = os == 'b2g' || ((os == 'linux') && (buildapp == 'mulet'))
 
 ########################################################################
 # All
 #[_wrappers/test_always-fail.html]
 #fail-if = 1
 # We'll be able to use `fail-if` after bug 987849.
 
 ########################################################################
--- a/widget/tests/mochitest.ini
+++ b/widget/tests/mochitest.ini
@@ -1,11 +1,11 @@
 [DEFAULT]
 skip-if = buildapp == 'mulet' || buildapp == 'b2g'
 support-files = utils.js
 
 [test_assign_event_data.html]
 skip-if = toolkit == "cocoa" # Mac: Bug 933303
 [test_bug565392.html]
-skip-if = toolkit != "windows" || (e10s && os == 'win')
+skip-if = toolkit != "windows" || e10s # Bug 1267406
 [test_picker_no_crash.html]
-skip-if = toolkit != "windows" || (e10s && os == 'win')
+skip-if = toolkit != "windows" || e10s # Bug 1267491
 support-files = window_picker_no_crash_child.html