Merge mozilla-central to mozilla-inbound
authorEd Morley <bmo@edmorley.co.uk>
Wed, 28 Mar 2012 23:23:32 +0100
changeset 90573 16d5e6f8ed89a97fb83fb30514a8ce5e9a9b834c
parent 90572 6654f183d2143b340f42ebee673a92c73fd8f8fb (current diff)
parent 90504 f0a104d6cc36c73cc391f979db4ec0c7754314e0 (diff)
child 90574 5f280b4ff6f840d28ad411e51ec0a38daea75c24
push id22366
push usermak77@bonardo.net
push dateThu, 29 Mar 2012 15:38:30 +0000
treeherdermozilla-central@ff3521bc6559 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone14.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge mozilla-central to mozilla-inbound
--- a/dom/tests/mochitest/dom-level1-core/DOMTestCase.js
+++ b/dom/tests/mochitest/dom-level1-core/DOMTestCase.js
@@ -639,16 +639,39 @@ function getResourceURI(name, scheme, co
     return fileBase + name + getSuffix(contentType);
 }
 
 
 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;
     return true;
   }
   return false;
 }
 
--- a/dom/tests/mochitest/dom-level2-core/DOMTestCase.js
+++ b/dom/tests/mochitest/dom-level2-core/DOMTestCase.js
@@ -643,16 +643,39 @@ function getResourceURI(name, scheme, co
     return fileBase + name + getSuffix(contentType);
 }
 
 
 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(); });
 function testFails (test) {
   if (!test.result) {
     test.todo = true;
     return true;
   }
--- a/dom/tests/mochitest/dom-level2-html/DOMTestCase.js
+++ b/dom/tests/mochitest/dom-level2-html/DOMTestCase.js
@@ -643,16 +643,39 @@ function getResourceURI(name, scheme, co
     return fileBase + name + getSuffix(contentType);
 }
 
 
 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(); });
 function testFails (test) {
   if (!test.result) {
     test.todo = true;
     return true;
   }