Bug 1262831 - Enable browser_frame_elements.js, browser_test_content.js and browser_test_new_window_from_content.js in dom/tests/browser/browser.ini. r=jimm
authorTracy Walker <twalker@mozilla.com>
Mon, 11 Apr 2016 15:41:50 -0500
changeset 331213 a732557d9efc0f243d7d0110f0a181069cf82f10
parent 331212 c29e1bedf682439dc63eef18a4e63ca00d7a34e1
child 331214 3b3d8b016792eff1b67debd4dde55b976926a5fc
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)
reviewersjimm
bugs1262831
milestone48.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 1262831 - Enable browser_frame_elements.js, browser_test_content.js and browser_test_new_window_from_content.js in dom/tests/browser/browser.ini. r=jimm
dom/tests/browser/browser.ini
--- a/dom/tests/browser/browser.ini
+++ b/dom/tests/browser/browser.ini
@@ -10,17 +10,16 @@ support-files =
   !/dom/tests/mochitest/geolocation/network_geolocation.sjs
 
 [browser_test_toolbars_visibility.js]
 support-files =
   test_new_window_from_content_child.html
 [browser_bug1008941_dismissGeolocationHanger.js]
 skip-if = buildapp == 'mulet'
 [browser_test__content.js]
-skip-if = e10s
 [browser_ConsoleAPITests.js]
 skip-if = e10s
 [browser_ConsoleAPI_originAttributes.js]
 [browser_ConsoleStorageAPITests.js]
 skip-if = e10s
 [browser_ConsoleStoragePBTest_perwindowpb.js]
 skip-if = e10s
 [browser_autofocus_background.js]
@@ -30,21 +29,20 @@ skip-if= buildapp == 'mulet'
 skip-if = e10s
 [browser_bug396843.js]
 skip-if = e10s
 [browser_focus_steal_from_chrome.js]
 skip-if = e10s
 [browser_focus_steal_from_chrome_during_mousedown.js]
 skip-if = e10s
 [browser_frame_elements.js]
-skip-if = e10s
 [browser_localStorage_privatestorageevent.js]
 skip-if = e10s
 [browser_test_new_window_from_content.js]
-skip-if = (toolkit == 'android' || buildapp == 'b2g' || buildapp == 'mulet') || e10s
+skip-if = (toolkit == 'android' || buildapp == 'b2g' || buildapp == 'mulet') || (os == "linux" && debug) # see bug 1261495 for Linux debug time outs
 support-files =
   test_new_window_from_content_child.html
 [browser_webapps_permissions.js]
 # TODO: Re-enable permissions tests on Mac, bug 795334
 skip-if = buildapp != "b2g" || e10s
 support-files =
   test-webapp.webapp
   test-webapp-reinstall.webapp