diff --git a/dom/tests/mochitest/general/mochitest.ini b/dom/tests/mochitest/general/mochitest.ini index ce316172e524..95fabaa281b7 100644 --- a/dom/tests/mochitest/general/mochitest.ini +++ b/dom/tests/mochitest/general/mochitest.ini @@ -1,5 +1,4 @@ [DEFAULT] -skip-if = e10s support-files = 497633.html file_MozEnteredDomFullscreen.html @@ -35,7 +34,7 @@ support-files = resource_timing.js [test_497898.html] -skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || toolkit == 'android' #Bug 931116, b2g desktop specific, initial triage +skip-if = ((buildapp == 'mulet' || buildapp == 'b2g') && toolkit != 'gonk') || toolkit == 'android' #Bug 931116, b2g desktop specific, initial triage [test_bug504220.html] [test_bug628069_1.html] skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage @@ -46,7 +45,7 @@ skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop spec [test_bug861217.html] [test_clientRects.html] [test_clipboard_events.html] -skip-if = buildapp == 'b2g' # b2g(clipboard undefined) b2g-debug(clipboard undefined) b2g-desktop(clipboard undefined) +skip-if = e10s || buildapp == 'b2g' # b2g(clipboard undefined) b2g-debug(clipboard undefined) b2g-desktop(clipboard undefined) [test_consoleAPI.html] [test_DOMMatrix.html] [test_domWindowUtils.html] @@ -56,12 +55,12 @@ skip-if = buildapp == 'b2g' # b2g(clipboard undefined) b2g-debug(clipboard undef skip-if = buildapp == 'mulet' [test_focus_legend_noparent.html] [test_focusrings.xul] -skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT +skip-if = e10s || buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT [test_for_of.html] [test_frameElementWrapping.html] [test_framedhistoryframes.html] [test_idleapi_permissions.html] -skip-if = buildapp == 'b2g' || buildapp == 'mulet' +skip-if = e10s || buildapp == 'b2g' || buildapp == 'mulet' [test_interfaces.html] skip-if = ((buildapp == 'mulet' || buildapp == 'b2g') && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage # [test_network_events.html] @@ -75,13 +74,13 @@ skip-if = buildapp == 'mulet' skip-if = buildapp == 'mulet' [test_picture_pref.html] [test_resource_timing.html] -skip-if = buildapp == 'b2g' || buildapp == 'mulet' # b2g(No clipboard) b2g-debug(No clipboard) b2g-desktop(No clipboard) +skip-if = buildapp == 'b2g' || buildapp == 'mulet' [test_resource_timing_cross_origin.html] skip-if = buildapp == 'b2g' || buildapp == 'mulet' [test_performance_now.html] [test_srcset_pref.html] [test_showModalDialog.html] -skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' #Don't run modal tests on Android # b2g(showmodaldialog) b2g-debug(showmodaldialog) b2g-desktop(showmodaldialog) +skip-if = e10s || buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' #Don't run modal tests on Android # b2g(showmodaldialog) b2g-debug(showmodaldialog) b2g-desktop(showmodaldialog) [test_stylesheetPI.html] [test_vibrator.html] skip-if = buildapp == 'mulet' || toolkit == 'android' #CRASH_SUTAGENT diff --git a/dom/tests/mochitest/general/test_resource_timing.html b/dom/tests/mochitest/general/test_resource_timing.html index 16c8ead9e995..febd9f5ca81e 100644 --- a/dom/tests/mochitest/general/test_resource_timing.html +++ b/dom/tests/mochitest/general/test_resource_timing.html @@ -20,12 +20,15 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=822480 SimpleTest.waitForExplicitFinish(); // Resource timing is prefed off by default, so we had to use this workaround -SpecialPowers.setBoolPref("dom.enable_resource_timing", true); -var subwindow = window.open("resource_timing_main_test.html"); +SpecialPowers.pushPrefEnv({"set": [["dom.enable_resource_timing", true]]}, start); +var subwindow = null; + +function start() { + subwindow = window.open("resource_timing_main_test.html"); +} function finishTests() { subwindow.close(); - SpecialPowers.setBoolPref("dom.enable_resource_timing", false); SimpleTest.finish(); }