From 395004da77f8437e54f0f7980c7c3c54d3a5c9e0 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Mon, 25 Apr 2016 21:45:46 -0400
Subject: [PATCH] No bug - Re-enable some more tests that were disabled on e10s
 without a tracking bug.

--HG--
extra : histedit_source : fa83d576e38f400a6ec395101ea34b58573676aa
---
 devtools/client/framework/test/browser.ini           |  1 -
 devtools/client/inspector/markup/test/browser.ini    |  5 ++---
 devtools/client/shadereditor/test/browser.ini        | 12 ------------
 .../test/webgl-conformance/mochitest-errata.ini      |  9 +++------
 widget/tests/mochitest.ini                           |  4 ++--
 5 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/devtools/client/framework/test/browser.ini b/devtools/client/framework/test/browser.ini
index 6ed90bb61fd8..ee185e059353 100644
--- a/devtools/client/framework/test/browser.ini
+++ b/devtools/client/framework/test/browser.ini
@@ -80,6 +80,5 @@ skip-if = os == "mac" && os_version == "10.8" || os == "win" && os_version == "5
 [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]
diff --git a/devtools/client/inspector/markup/test/browser.ini b/devtools/client/inspector/markup/test/browser.ini
index 6c6ed642f45c..9ca299ea2f7d 100644
--- a/devtools/client/inspector/markup/test/browser.ini
+++ b/devtools/client/inspector/markup/test/browser.ini
@@ -55,7 +55,6 @@ skip-if = e10s # scratchpad.xul is not loading in e10s window
 [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]
@@ -65,8 +64,6 @@ skip-if = e10s && os == 'win'
 [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]
@@ -76,6 +73,8 @@ skip-if = e10s && os == 'win'
 [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]
diff --git a/devtools/client/shadereditor/test/browser.ini b/devtools/client/shadereditor/test/browser.ini
index 8d70d6df4f12..b26bc3a748f2 100644
--- a/devtools/client/shadereditor/test/browser.ini
+++ b/devtools/client/shadereditor/test/browser.ini
@@ -34,26 +34,14 @@ skip-if = true # Bug 942473, caused by Bug 940541
 [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'
diff --git a/dom/canvas/test/webgl-conformance/mochitest-errata.ini b/dom/canvas/test/webgl-conformance/mochitest-errata.ini
index 1021421acde0..49de67dfd620 100644
--- a/dom/canvas/test/webgl-conformance/mochitest-errata.ini
+++ b/dom/canvas/test/webgl-conformance/mochitest-errata.ini
@@ -6,12 +6,9 @@
 
 [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
diff --git a/widget/tests/mochitest.ini b/widget/tests/mochitest.ini
index 8c83d5027950..31823c51d5d4 100644
--- a/widget/tests/mochitest.ini
+++ b/widget/tests/mochitest.ini
@@ -5,7 +5,7 @@ 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