Merge mozilla-central to mozilla-inbound

This commit is contained in:
Ed Morley 2012-03-28 23:23:32 +01:00
commit c5ef5abdc0
3 changed files with 69 additions and 0 deletions

View File

@ -644,6 +644,29 @@ function getImplementation() {
return builder.getImplementation();
}
//sayrer override the SimpleTest logger
SimpleTest._logResult = function(test, passString, failString) {
var msg = test.result ? passString : failString;
msg += " | " + test.name;
if (test.result) {
if (test.todo)
parentRunner.logger.error(msg)
else
parentRunner.logger.log(msg);
} else {
msg += " | " + test.diag;
if (test.todo) {
parentRunner.logger.log(msg)
} else {
if (todoTests[docName]) {
parentRunner.logger.log("expected error in todo testcase | " + test.name);
} else {
parentRunner.logger.error(msg);
}
}
}
}
function testFails (test) {
if (!test.result) {
test.todo = true;

View File

@ -648,6 +648,29 @@ function getImplementation() {
return builder.getImplementation();
}
//sayrer override the SimpleTest logger
SimpleTest._logResult = function(test, passString, failString) {
var msg = test.result ? passString : failString;
msg += " | " + test.name;
if (test.result) {
if (test.todo)
parentRunner.logger.error(msg)
else
parentRunner.logger.log(msg);
} else {
msg += " | " + test.diag;
if (test.todo) {
parentRunner.logger.log(msg)
} else {
if (todoTests[docName]) {
parentRunner.logger.log("expected error in todo testcase | " + test.name);
} else {
parentRunner.logger.error(msg);
}
}
}
}
window.doc = window;
SimpleTest.waitForExplicitFinish();
addLoadEvent(function(){ setUpPage(); });

View File

@ -648,6 +648,29 @@ function getImplementation() {
return builder.getImplementation();
}
//sayrer override the SimpleTest logger
SimpleTest._logResult = function(test, passString, failString) {
var msg = test.result ? passString : failString;
msg += " | " + test.name;
if (test.result) {
if (test.todo)
parentRunner.logger.error(msg)
else
parentRunner.logger.log(msg);
} else {
msg += " | " + test.diag;
if (test.todo) {
parentRunner.logger.log(msg)
} else {
// if (todoTests[docName]) {
// parentRunner.logger.log("expected error in todo testcase | " + test.name);
//} else {
parentRunner.logger.error(msg);
//}
}
}
}
window.doc = window;
SimpleTest.waitForExplicitFinish();
addLoadEvent(function(){ setUpPage(); });