Halt on first error. Update $ERROR to conform to expected thrown errors.

Author: bterlson

lib/runners/console.js

@@ -8,15 +8,27 @@ var fs = require('fs');
 var cp = require('child_process');
 var counter = 0;
 
+var test262Error = function() {
+    function Test262Error(message) {
+        if (message) this.message = message;
+    }
+
+    Test262Error.prototype.name = "Test262Error";
+    
+    Test262Error.prototype.toString = function () {
+        return "Test262Error: " + this.message;
+    };
+}.toString().slice(14, -1);
+
 var doneFn = function $DONE(err) {
     if(err) $ERROR(err);
     $LOG('test262/done');
 }.toString()
 
 var errorFn = function $ERROR(err) {
     if(typeof err === "object" && err !== null && "name" in err)
-        $LOG("test262/error " + err.name + ": " + err.message)
-    else $LOG("test262/error Error: " + err);
+        throw err;
+    else throw new Test262Error(err);
 }.toString()
 
 var batchDoneFn = function $DONE(err) {
@@ -40,6 +52,7 @@ function ConsoleRunner(args) {
     if(args.batch) {
         // Done comes from the parent context
         this.deps = [
+            test262Error,
             errorFn,
             this.logFn
         ]
@@ -51,6 +64,7 @@ function ConsoleRunner(args) {
         }
     } else {
         this.deps = [
+            test262Error,
             doneFn,
             errorFn,
             this.logFn

lib/runners/node-ip.js

@@ -6,6 +6,14 @@ module.exports = NodeRunner;
 var vm = require('vm');
 var Runner = require('../runner');
 
+function Test262Error(message) {
+    if (message) this.message = message;
+}
+
+Test262Error.prototype.toString = function () {
+    return this.message;
+};
+
 function NodeRunner() { Runner.apply(this, arguments); }
 NodeRunner.prototype = Object.create(Runner.prototype);
 NodeRunner.prototype.execute = function(test, cb) {
@@ -15,17 +23,21 @@ NodeRunner.prototype.execute = function(test, cb) {
 
     var context = {
         $ERROR: function(err) {
-            error = err;
+            if(typeof err === "object" && err !== null && "name" in err)
+                throw err;
+            else throw new Test262Error(err);
         },
         $DONE: function(err) {
-            if(err) context.$ERROR(err);
+            error = err;
             result.doneCalled = true;
         },
         $LOG: function(log) {
             result.log.push(log);
         },
-        process: process
+        process: process,
+        Test262Error: Test262Error
     }
+
     try {
         vm.runInNewContext(contents, context, {displayErrors: false});
     } catch(e) {

lib/runners/node.js

@@ -21,7 +21,6 @@ function NodeRunner(args) {
 
         this._instance = cp.spawn(parts[0], parts.slice(1));
 
-
         var results = { log: [] };
 
         _(this._instance.stdout).flatMap(function(data) {

lib/runners/nodehost.js

@@ -1,21 +1,29 @@
 var vm = require('vm');
 
+function Test262Error(message) {
+    if (message) this.message = message;
+}
+
+Test262Error.prototype.toString = function () {
+    return "Test262Error: " + this.message;
+};
+
 process.stdin.resume();
 process.stdin.on('data', function(test) {
     var result = { log: [] }
-    var error;
     var context = {
         $ERROR: function(err) {
-            error = err;
+            if(typeof err === "object" && err !== null && "name" in err)
+                throw err;
+            else throw new Test262Error(err);
         },
-        $DONE: function(err) {
-            if(err) context.$ERROR(err);
+        $DONE: function(error) {
             if(error) {
                 if(typeof error === 'object') {
                     if(error.hasOwnProperty('stack')) {
                         console.log("test262/error " + error.stack);
                     } else {
-                        console.log("test262/error " + (error.name || Test262Error)  + ": " + error.message);
+                        console.log("test262/error " + (error.name || "Test262Error")  + ": " + error.message);
                     }
                 } else {
                     console.log('test262/error Error: ' + error);
@@ -26,7 +34,8 @@ process.stdin.on('data', function(test) {
         $LOG: function(log) {
             console.log(log);
         },
-        process: process
+        process: process,
+        Test262Error: Test262Error
     }
 
     try {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "test262-harness",
   "repository": "bterlson/test262-harness",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "Node-based harness for test262",
   "main": "index.js",
   "bin": {

test/expected.js

@@ -7,8 +7,8 @@ var all = [
     { file: 'test/collateral/bothStrict.js', strictMode: true, pass: true },
     { file: 'test/collateral/strict.js', strictMode: true, pass: true },
     { file: 'test/collateral/noStrict.js', strictMode: false, pass: true },
-    { file: 'test/collateral/error.js', strictMode: false, pass: false, errorMessage: 'failure message', errorName: 'Error' },
-    { file: 'test/collateral/error.js', strictMode: true, pass: false, errorMessage: 'failure message', errorName: 'Error' },
+    { file: 'test/collateral/error.js', strictMode: false, pass: false, errorMessage: 'failure message', errorName: 'Test262Error' },
+    { file: 'test/collateral/error.js', strictMode: true, pass: false, errorMessage: 'failure message', errorName: 'Test262Error' },
     { file: 'test/collateral/thrownError.js', strictMode: false, pass: false, errorMessage: 'failure message', errorName: 'Error', topOfStack: "foo" },
     { file: 'test/collateral/thrownError.js', strictMode: true, pass: false, errorMessage: 'failure message', errorName: 'Error', topOfStack: "foo" },
 ]