Hard-code source for $ERROR and Test262Error

tc39 · Jul 21, 2015 · 33c083c · 33c083c
1 parent 81244a5
commit 33c083c
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 62 deletions.
diff --git a/lib/helpers/sta.js b/lib/helpers/sta.js
diff --git a/lib/runner.js b/lib/runner.js
@@ -7,7 +7,7 @@ var fs = require('fs');
 var path = require('path');
 var parseFile = require('test262-parser').parseFile;
 
-var autoIncludes = ['sta.js', 'assert.js'];
+var autoIncludes = ['assert.js'];
 
 function Runner(opts) {
     this.opts = opts
@@ -38,6 +38,10 @@ Runner.prototype.compile = function(test) {
         test.contents += "\n;$DONE();\n"
     }
 
+    test.contents = [
+        this.test262ErrorSrc, this.errorFnSrc, test.contents
+    ].join(";\n");
+
     this.deps.forEach(function(dep) {
         test.contents = dep + "\n" + test.contents;
     })
@@ -84,6 +88,24 @@ Runner.prototype.link = function(test) {
     test.contents = includeContent + test.contents;
 }
 
+Runner.prototype.test262ErrorSrc = 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);
+
+Runner.prototype.errorFnSrc = function $ERROR(err) {
+    if(typeof err === "object" && err !== null && "name" in err)
+        throw err;
+    else throw new Test262Error(err);
+}.toString();
+
 var errorLogRe = /^test262\/error (.*)$/;
 // Result is expected to have the following keys:
 // errorString: Error of the form ErrorName: ErrorMessage. Optional.

diff --git a/lib/runners/console.js b/lib/runners/console.js
@@ -15,8 +15,7 @@ var doneFn = function $DONE(err) {
 
 var batchDoneFn = function $DONE(err) {
     if(err) {
-        if(typeof err === "object" && err !== null) {
-            err.name = err.name || "Test262Error";
+        if(typeof err === "object" && err !== null && "name" in err) {
             if("stack" in err) $LOG("test262/error " + err.stack)
             else $LOG("test262/error " + err.name + ": " + err.message)
         }

diff --git a/lib/runners/node-ip.js b/lib/runners/node-ip.js
@@ -13,7 +13,7 @@ NodeRunner.prototype.execute = function(test, cb) {
     var error;
     var result = {log: []};
 
-    var context = vm.createContext({
+    var context = {
         $DONE: function(err) {
             error = err;
             result.doneCalled = true;
@@ -22,10 +22,10 @@ NodeRunner.prototype.execute = function(test, cb) {
             result.log.push(log);
         },
         process: process
-    });
+    };
 
     try {
-        vm.runInContext(contents, context, {displayErrors: false});
+        vm.runInNewContext(contents, context, {displayErrors: false});
     } catch(e) {
         error = e;
     }

diff --git a/lib/runners/nodehost.js b/lib/runners/nodehost.js
@@ -3,7 +3,7 @@ var vm = require('vm');
 process.stdin.resume();
 process.stdin.on('data', function(test) {
     var result = { log: [] }
-    var context = vm.createContext({
+    var context = {
         $DONE: function(error) {
             if(error) {
                 if(typeof error === 'object') {
@@ -22,10 +22,10 @@ process.stdin.on('data', function(test) {
             console.log(log);
         },
         process: process
-    });
+    };
 
     try {
-        vm.runInContext(test, context, {displayErrors: false});
+        vm.runInNewContext(test, context, {displayErrors: false});
     } catch(e) {
         context.$DONE(e);
     }

diff --git a/test/test262alike/badHarness/sta.js b/test/test262alike/badHarness/sta.js
diff --git a/test/test262alike/harness/sta.js b/test/test262alike/harness/sta.js