From 1e3a1af74f94b653e86e5d40c8df7973ab9fbe3c Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Mon, 24 Aug 2015 18:50:12 -0400 Subject: [PATCH] Backed out changeset 91f1119b2534 (bug 1112599) for causing frequent Linux32 browser_webconsole_trackingprotection_errors.js shutdown hangs. CLOSED TREE --- browser/devtools/webconsole/test/browser.ini | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/browser/devtools/webconsole/test/browser.ini b/browser/devtools/webconsole/test/browser.ini index b672038bdc8..a37e2ac3458 100644 --- a/browser/devtools/webconsole/test/browser.ini +++ b/browser/devtools/webconsole/test/browser.ini @@ -139,6 +139,7 @@ support-files = [browser_bug1045902_console_csp_ignore_reflected_xss_message.js] [browser_bug664688_sandbox_update_after_navigation.js] +skip-if = e10s # Bug 1042253 - webconsole e10s tests (intermittent Linux debug) [browser_bug_638949_copy_link_location.js] [browser_bug_862916_console_dir_and_filter_off.js] [browser_bug_865288_repeat_different_objects.js] @@ -232,6 +233,7 @@ skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s [browser_webconsole_bug_594497_history_arrow_keys.js] [browser_webconsole_bug_595223_file_uri.js] [browser_webconsole_bug_595350_multiple_windows_and_tabs.js] +skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s [browser_webconsole_bug_595934_message_categories.js] skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s (expectUncaughtException) [browser_webconsole_bug_597103_deactivateHUDForContext_unfocused_window.js] @@ -287,6 +289,7 @@ skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s [browser_webconsole_bug_734061_No_input_change_and_Tab_key_pressed.js] [browser_webconsole_bug_737873_mixedcontent.js] [browser_webconsole_bug_752559_ineffective_iframe_sandbox_warning.js] +skip-if = e10s # Bug 1042253 - webconsole e10s tests (Linux debug timeout) [browser_webconsole_bug_762593_insecure_passwords_about_blank_web_console_warning.js] skip-if = buildapp == 'mulet' [browser_webconsole_bug_762593_insecure_passwords_web_console_warning.js] @@ -306,13 +309,16 @@ skip-if = buildapp == 'mulet' [browser_webconsole_bug_915141_toggle_response_logging_with_keyboard.js] [browser_webconsole_filter_buttons_contextmenu.js] [browser_webconsole_bug_1006027_message_timestamps_incorrect.js] +skip-if = e10s # Bug 1042253 - webconsole e10s tests (Linux debug intermittent) [browser_webconsole_bug_1010953_cspro.js] [browser_webconsole_certificate_messages.js] +skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s [browser_webconsole_show_subresource_security_errors.js] [browser_webconsole_cached_autocomplete.js] [browser_webconsole_change_font_size.js] [browser_webconsole_chrome.js] [browser_webconsole_clickable_urls.js] +skip-if = e10s # Bug 1042253 - webconsole e10s tests (Linux debug timeout) [browser_webconsole_closure_inspection.js] skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s [browser_webconsole_completion.js] @@ -326,11 +332,12 @@ skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s [browser_webconsole_history.js] [browser_webconsole_hpkp_invalid-headers.js] [browser_webconsole_hsts_invalid-headers.js] -skip-if = buildapp == 'mulet' +skip-if = buildapp == 'mulet' || e10s # Bug 1042253 - webconsole e10s tests [browser_webconsole_input_field_focus_on_panel_select.js] [browser_webconsole_inspect-parsed-documents.js] [browser_webconsole_js_input_expansion.js] [browser_webconsole_jsterm.js] +skip-if = e10s # Bug 1042253 - webconsole e10s tests (Linux debug timeout) [browser_webconsole_live_filtering_of_message_types.js] [browser_webconsole_live_filtering_on_search_strings.js] [browser_webconsole_message_node_id.js] @@ -348,6 +355,7 @@ skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s [browser_webconsole_split_escape_key.js] [browser_webconsole_split_focus.js] [browser_webconsole_split_persist.js] +skip-if = e10s # Bug 1042253 - webconsole e10s tests (Linux debug timeout) [browser_webconsole_trackingprotection_errors.js] tags = trackingprotection [browser_webconsole_view_source.js] @@ -358,6 +366,7 @@ skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s (expectUncaug [browser_webconsole_autocomplete_in_debugger_stackframe.js] skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s [browser_webconsole_autocomplete_popup_close_on_tab_switch.js] +skip-if = e10s # Bug 1042253 - webconsole tests disabled with e10s [browser_webconsole_autocomplete-properties-with-non-alphanumeric-names.js] [browser_console_hide_jsterm_when_devtools_chrome_enabled_false.js] [browser_console_history_persist.js] @@ -370,8 +379,10 @@ skip-if = e10s # Bug 1042253 - webconsole e10s tests [browser_webconsole_output_06.js] [browser_webconsole_output_dom_elements_01.js] [browser_webconsole_output_dom_elements_02.js] +skip-if = e10s # Bug 1042253 - webconsole e10s tests (Linux debug timeout) [browser_webconsole_output_dom_elements_03.js] [browser_webconsole_output_dom_elements_04.js] +skip-if = e10s # Bug 1042253 - webconsole e10s tests (Linux debug timeout) [browser_webconsole_output_events.js] [browser_webconsole_output_regexp.js] [browser_webconsole_output_table.js]