Backed out changeset 2fb5fd8171ad (bug 1080784) for e10s bc1 test failures

This commit is contained in:
Carsten "Tomcat" Book 2014-10-21 13:48:10 +02:00
parent 85947c26d8
commit 81976c78d1
3 changed files with 6 additions and 10 deletions

View File

@ -1,4 +1,5 @@
[DEFAULT] [DEFAULT]
skip-if = e10s # Most of these tests fail due to Bug ?????? - SessionStore is disabled in e10s
support-files = support-files =
dummy_page.html dummy_page.html
head.js head.js
@ -22,7 +23,6 @@ skip-if = buildapp == 'mulet'
[browser_tabview_bug587990.js] [browser_tabview_bug587990.js]
[browser_tabview_bug588265.js] [browser_tabview_bug588265.js]
[browser_tabview_bug589324.js] [browser_tabview_bug589324.js]
skip-if = e10s # Bug 1086190
[browser_tabview_bug590606.js] [browser_tabview_bug590606.js]
[browser_tabview_bug591706.js] [browser_tabview_bug591706.js]
[browser_tabview_bug593283.js] [browser_tabview_bug593283.js]
@ -36,7 +36,6 @@ skip-if = e10s # Bug 1086190
[browser_tabview_bug595930.js] [browser_tabview_bug595930.js]
[browser_tabview_bug595943.js] [browser_tabview_bug595943.js]
[browser_tabview_bug595965.js] [browser_tabview_bug595965.js]
skip-if = e10s # Bug 1086190
[browser_tabview_bug596781.js] [browser_tabview_bug596781.js]
[browser_tabview_bug597360.js] [browser_tabview_bug597360.js]
[browser_tabview_bug597399.js] [browser_tabview_bug597399.js]
@ -57,7 +56,6 @@ skip-if = true # Bug 704417
[browser_tabview_bug607108.js] [browser_tabview_bug607108.js]
skip-if = os == 'linux' # Bug 947521 skip-if = os == 'linux' # Bug 947521
[browser_tabview_bug608037.js] [browser_tabview_bug608037.js]
skip-if = e10s # Bug 1086190
[browser_tabview_bug608153.js] [browser_tabview_bug608153.js]
[browser_tabview_bug608158.js] [browser_tabview_bug608158.js]
[browser_tabview_bug608184.js] [browser_tabview_bug608184.js]
@ -76,14 +74,12 @@ skip-if = buildapp == 'mulet'
[browser_tabview_bug619937.js] [browser_tabview_bug619937.js]
[browser_tabview_bug622835.js] [browser_tabview_bug622835.js]
[browser_tabview_bug623768.js] [browser_tabview_bug623768.js]
skip-if = e10s # Bug 1086190
[browser_tabview_bug624265_perwindowpb.js] [browser_tabview_bug624265_perwindowpb.js]
skip-if = true # Bug 921984, hopefully fixed by bug 930202 skip-if = true # Bug 921984, hopefully fixed by bug 930202
[browser_tabview_bug624692.js] [browser_tabview_bug624692.js]
[browser_tabview_bug624727_perwindowpb.js] [browser_tabview_bug624727_perwindowpb.js]
skip-if = buildapp == 'mulet' skip-if = buildapp == 'mulet'
[browser_tabview_bug624847.js] [browser_tabview_bug624847.js]
skip-if = e10s # Bug 1086190
[browser_tabview_bug624931.js] [browser_tabview_bug624931.js]
[browser_tabview_bug624953.js] [browser_tabview_bug624953.js]
[browser_tabview_bug625195.js] [browser_tabview_bug625195.js]
@ -92,7 +88,6 @@ skip-if = e10s # Bug 1086190
[browser_tabview_bug625955.js] [browser_tabview_bug625955.js]
[browser_tabview_bug626368.js] [browser_tabview_bug626368.js]
[browser_tabview_bug626455.js] [browser_tabview_bug626455.js]
skip-if = e10s # Bug 1086190
[browser_tabview_bug626525.js] [browser_tabview_bug626525.js]
[browser_tabview_bug626791.js] [browser_tabview_bug626791.js]
skip-if = buildapp == 'mulet' skip-if = buildapp == 'mulet'
@ -178,7 +173,6 @@ skip-if = buildapp == 'mulet'
skip-if = os == "mac" || os == "win" # Bug 945687 skip-if = os == "mac" || os == "win" # Bug 945687
[browser_tabview_launch.js] [browser_tabview_launch.js]
[browser_tabview_multiwindow_search.js] [browser_tabview_multiwindow_search.js]
skip-if = e10s # Bug 1086190
[browser_tabview_pending_tabs.js] [browser_tabview_pending_tabs.js]
[browser_tabview_privatebrowsing_perwindowpb.js] [browser_tabview_privatebrowsing_perwindowpb.js]
skip-if = os == 'linux' || e10s # linux: Bug 944300; e10s: bug ?????? - "leaked until shutdown [nsGlobalWindow #82 about:blank]" skip-if = os == 'linux' || e10s # linux: Bug 944300; e10s: bug ?????? - "leaked until shutdown [nsGlobalWindow #82 about:blank]"

View File

@ -63,8 +63,9 @@ function endGame() {
} }
function newWindowWithTabView(callback, completeCallback) { function newWindowWithTabView(callback, completeCallback) {
let charsetArg = "charset=" + window.content.document.characterSet;
let win = window.openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no,height=800,width=800", let win = window.openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no,height=800,width=800",
"about:blank", null, null, null, true); "about:blank", charsetArg, null, null, true);
let onLoad = function() { let onLoad = function() {
win.removeEventListener("load", onLoad, false); win.removeEventListener("load", onLoad, false);
let onShown = function() { let onShown = function() {

View File

@ -9,9 +9,10 @@ function animateZoom() prefsBranch.getBoolPref("animate_zoom");
function test() { function test() {
waitForExplicitFinish(); waitForExplicitFinish();
let charsetArg = "charset=" + window.content.document.characterSet;
let win = window.openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no", let win = window.openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no",
"about:blank", null, null, null, true); "about:blank", charsetArg, null, null, true);
registerCleanupFunction(function() { registerCleanupFunction(function() {
prefsBranch.setBoolPref("animate_zoom", true); prefsBranch.setBoolPref("animate_zoom", true);