Merge branch 'master' of github.com:tmpvar/mjsunit.runner

tmpvar · May 4, 2010 · 1efe39e · 1efe39e
2 parents d44182f + 920f030
commit 1efe39e
Showing 1 changed file with 24 additions and 24 deletions.
diff --git a/lib/runner.js b/lib/runner.js
@@ -96,7 +96,7 @@ exports.run = function(testSuites) {
   }
 
   if (args.json) {
-    sys.puts(JSON.stringify({
+    process.stdio.write(JSON.stringify({
       total: total, 
       pass: total-errors.length, 
       fail: errors.length
@@ -108,7 +108,7 @@ exports.run = function(testSuites) {
     for (var i = 0; i<errors.length; i++)
     {
       sys.puts('\nFailure in ' + errors[i].suiteName + ' suite; method: ' + errors[i].method);
-      sys.puts(errors[i].error.stack);
+      sys.puts(errors[i].error.stack || errors[i].error.message);
     }
   }
 
@@ -117,30 +117,30 @@ exports.run = function(testSuites) {
     sys.puts(errors.length + " of " + total + " failed (" + Math.floor(((total-errors.length)/total)*100)  + "% success)" );
     sys.puts(" ");
   } else {
-  var numerator, denominator, percent;
-  sys.puts("");
-
-  var padName = function(name) {
-    while(name.length < 13) {
-      name+=" ";
-    }
-    return name;
-  }
+    
+    var numerator, denominator, percent;
+    sys.puts("");
+    var padName = function(name) {
+      while(name.length < 13) {
+        name+=" ";
+      }
+      return name;
+    };
 
-  for (var suiteName in testSuites)
-  {
-    if (testSuites.hasOwnProperty(suiteName)) {
-      numerator   = testSuites[suiteName].total - testSuites[suiteName].errors.length;
-      denominator = testSuites[suiteName].total;
-      percent     = Math.floor((numerator / denominator)*100) || 0;
-      sys.puts(padName(suiteName) + "\t" + numerator + "/" + denominator + "\t\t" + percent + "% passing");
+    for (var suiteName in testSuites)
+    {
+      if (testSuites.hasOwnProperty(suiteName)) {
+        numerator   = testSuites[suiteName].total - testSuites[suiteName].errors.length;
+        denominator = testSuites[suiteName].total;
+        percent     = Math.floor((numerator / denominator)*100) || 0;
+        sys.puts(padName(suiteName) + "\t" + numerator + "/" + denominator + "\t\t" + percent + "% passing");
+      }
     }
-  }
 
-  sys.puts("--------------------------------------------");
-  numerator   = total-errors.length;
-  denominator = total;
-  percent     = Math.floor((numerator / denominator)*100) || 0;
-  sys.puts("TOTALS:\t\t" + numerator + "/" + denominator + "\t" + percent + "% passing\r\n");
+    sys.puts("--------------------------------------------");
+    numerator   = total-errors.length;
+    denominator = total;
+    percent     = Math.floor((numerator / denominator)*100) || 0;
+    sys.puts("TOTALS:\t\t" + numerator + "/" + denominator + "\t" + percent + "% passing\r\n");
   }
 };