mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Merge
This commit is contained in:
commit
77dae2b19a
@ -40,6 +40,12 @@ window.addEventListener("message", function(e) {
|
||||
gen = runTest();
|
||||
|
||||
function runTest() {
|
||||
if (navigator.platform == "MacIntel") {
|
||||
todo(false, "httpd.js fails on Mac");
|
||||
SimpleTest.finish();
|
||||
yield;
|
||||
}
|
||||
|
||||
var loader = document.getElementById('loader');
|
||||
var loaderWindow = loader.contentWindow;
|
||||
loader.onload = function () { gen.next() };
|
||||
@ -402,10 +408,6 @@ function runTest() {
|
||||
"wrong responseText in test for " + test.toSource());
|
||||
}
|
||||
|
||||
/*SimpleTest.finish();
|
||||
|
||||
yield;*/
|
||||
|
||||
for each(test in failTests) {
|
||||
req = {
|
||||
url: baseURL + "allowOrigin=" + escape(origin),
|
||||
|
@ -26,6 +26,12 @@ window.addEventListener("message", function(e) {
|
||||
gen = runTest();
|
||||
|
||||
function runTest() {
|
||||
if (navigator.platform == "MacIntel") {
|
||||
todo(false, "httpd.js fails on Mac");
|
||||
SimpleTest.finish();
|
||||
yield;
|
||||
}
|
||||
|
||||
var loader = document.getElementById('loader');
|
||||
var loaderWindow = loader.contentWindow;
|
||||
loader.onload = function () { gen.next() };
|
||||
|
Loading…
Reference in New Issue
Block a user