fix bad merge a=bustage-fix
☠☠ backed out by f4a13204b80a ☠ ☠
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Tue, 24 Nov 2015 13:22:46 +0100
changeset 305625 337f0ed43821944b9ba77dd4b98083192413a765
parent 305624 e3b938c0cde25153e263e91c2d1a6d1ca5f1f0f7
child 305626 90d962ecd677e7c897b258a67d8c4e1274643115
push id1001
push userraliiev@mozilla.com
push dateMon, 18 Jan 2016 19:06:03 +0000
treeherdermozilla-release@8b89261f3ac4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
milestone44.0a2
fix bad merge a=bustage-fix
browser/components/extensions/test/browser/browser.ini
toolkit/components/extensions/test/mochitest/mochitest.ini
--- a/browser/components/extensions/test/browser/browser.ini
+++ b/browser/components/extensions/test/browser/browser.ini
@@ -10,17 +10,16 @@ support-files =
 
 [browser_ext_simple.js]
 [browser_ext_currentWindow.js]
 [browser_ext_browserAction_simple.js]
 [browser_ext_browserAction_pageAction_icon.js]
 [browser_ext_browserAction_context.js]
 [browser_ext_pageAction_context.js]
 [browser_ext_pageAction_popup.js]
-[browser_ext_browserAction_popup.js]
 [browser_ext_popup_api_injection.js]
 [browser_ext_contextMenus.js]
 [browser_ext_getViews.js]
 [browser_ext_tabs_executeScript.js]
 [browser_ext_tabs_query.js]
 [browser_ext_tabs_update.js]
 [browser_ext_tabs_onUpdated.js]
 [browser_ext_tabs_sendMessage.js]
--- a/toolkit/components/extensions/test/mochitest/mochitest.ini
+++ b/toolkit/components/extensions/test/mochitest/mochitest.ini
@@ -29,14 +29,9 @@ support-files =
 [test_ext_sandbox_var.html]
 [test_ext_sendmessage_reply.html]
 [test_ext_sendmessage_doublereply.html]
 [test_ext_storage.html]
 [test_ext_background_runtime_connect_params.html]
 [test_ext_cookies.html]
 [test_ext_bookmarks.html]
 [test_ext_alarms.html]
-[test_ext_background_window_properties.html]
-[test_ext_background_sub_windows.html]
 [test_ext_background_api_injection.html]
-[test_ext_jsversion.html]
-skip-if = e10s # Uses a console monitor which doesn't work from a content process. The code being tested doesn't run in a tab content process in any case.
-[test_ext_i18n.html]