Don't use process.fork since node runner may target node with different command line

Author: bterlson

lib/runner.js

@@ -79,15 +79,27 @@ var errorLogRe = /^test262\/error (.*)$/;
 // errorMessage: message from error thrown (used for debugging purposes)
 // errorStack: stack trace of error thrown (used for debugging purposes)
 Runner.prototype.validateResult = function(test, result) {
+    var expectingStack = false;
     var isNegative = test.attrs.flags.negative || test.attrs.negative;
     // parse result from log
     (result.log || []).forEach(function(log) {
         var errorMatch = log.match(errorLogRe);
         if(errorMatch) {
             result.errorString = errorMatch[1];
+            expectingStack = true;
             return;
         }
 
+        if(expectingStack) {
+            if(log.match(/^\s+at/)) {
+                result.errorStack = result.errorStack || result.errorString + "\n";
+                result.errorStack += log + "\n";
+                return;
+            } else {
+                expectingStack = false;
+            }
+        }
+
         if(log === "test262/done") {
             result.doneCalled = true;
         }

lib/runners/node.js

@@ -1,28 +1,44 @@
 var Runner = require('../runner');
 var ConsoleRunner = require('./console');
 var cp = require('child_process');
+var _ = require('highland');
 
 module.exports = NodeRunner;
 
 function NodeRunner(args) {
-    args.consoleCommand = 'dummy';
+    args.consoleCommand = args.consoleCommand || "node.exe";
     var runner = this;
+
     ConsoleRunner.apply(this, arguments);
+
     this.deps = []; // all env deps provided by nodehost.js
 
-    this._instance = cp.fork(__dirname + '/nodehost.js')
-    this._instance.on('message', function(result) {
-        runner.validateResult(runner._test, result)
-        runner._testDone();
+    this._instance = cp.spawn(args.consoleCommand, [__dirname + '/nodehost.js']);
+
+
+    var results = { log: [] };
+
+    _(this._instance.stdout).flatMap(function(data) {
+        return _(data.toString().split(/\r?\n/g));
+    }).each(function(line) {
+        results.log.push(line);
+        switch(line) {
+            case 'test262/done':
+                runner.validateResult(runner._test, results);
+                results = { log: [] };
+
+                runner._testDone();
+                break;
+        }
     })
 }
 NodeRunner.prototype = Object.create(ConsoleRunner.prototype);
 NodeRunner.prototype.execute = function(test, cb) {
     this._test = test;
     this._testDone = cb;
-    this._instance.send(test.contents);
+    this._instance.stdin.write(test.contents);
 }
 
 NodeRunner.prototype.end = function() {
-    this._instance.disconnect();
+    this._instance.stdin.end();
 }

lib/runners/nodehost.js

@@ -1,6 +1,7 @@
 var vm = require('vm');
 
-process.on('message', function(test) {
+process.stdin.resume();
+process.stdin.on('data', function(test) {
     var result = { log: [] }
     var error;
     var context = {
@@ -11,25 +12,27 @@ process.on('message', function(test) {
             if(err) context.$ERROR(err);
             if(error) {
                 if(typeof error === 'object') {
-                    // custom thrown errors won't have a name property.
-                    result.errorName = error.name || "Test262Error";
-                    result.errorMessage = error.message;
-                    result.errorStack = error.stack
+                    if(error.hasOwnProperty('stack')) {
+                        console.log("test262/error " + error.stack);
+                    } else {
+                        console.log("test262/error " + (error.name || Test262Error)  + ": " + error.message);
+                    }
                 } else {
-                    result.errorName = error;
+                    console.log('test262/error Error: ' + error);
                 }
             }
-            result.doneCalled = true;
-            process.send(result);
+            console.log('test262/done');
         },
         $LOG: function(log) {
-            result.log.push(log);
-        }
+            console.log(log);
+        },
+        require: require,
+        console: console
     }
 
     try {
         vm.runInNewContext(test, context);
     } catch(e) {
         context.$DONE(e);
     }
-})
+});

package.json

@@ -1,7 +1,7 @@
 {
   "name": "test262-harness",
   "repository": "bterlson/test262-harness",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Node-based harness for test262",
   "main": "index.js",
   "bin": {
@@ -19,5 +19,11 @@
     "through": "~2.3.4"
   },
   "author": "Brian Terlson",
-  "license": "BSD"
+  "license": "BSD",
+  "files": [
+      "index.js",
+      "bin",
+      "lib",
+      "test"
+  ]
 }