Inject sta.js as provided by Test262

The Test262 project "interpreting" guidelines include the following requirement: > ### Test262-Defined Bindings > > The contents of the following files must be evaluated in the test realm's > global scope prior to test execution: > > 1. `harness/assert.js` > 2. `harness/sta.js` Satisfy this requirement by loading the provided file and injecting it into the test contents.
bocoup · Jan 19, 2018 · e1d2b3c · e1d2b3c
1 parent 3abeae8
commit e1d2b3c
Show file tree

Hide file tree

Showing 63 changed files with 540 additions and 550 deletions.
diff --git a/lib/compiler.js b/lib/compiler.js
@@ -2,7 +2,6 @@
 const fs = require('fs');
 const path = require('path');
 const parseFile = require('test262-parser').parseFile;
-const deps = fs.readFileSync(__dirname + '/compilerdeps.js');
 
 module.exports = function compile(test, options) {
   options = options || {};
@@ -28,20 +27,20 @@ module.exports = function compile(test, options) {
   if (test.attrs.flags.onlyStrict) {
     preludeContents += '"use strict";\n';
   }
-  preludeContents += deps;
 
   const helpers = test.attrs.includes;
   helpers.push('assert.js');
+  helpers.push('sta.js');
 
   if (test.attrs.flags.async) {
     helpers.push('doneprintHandle.js');
   }
 
   for (let i = 0; i < helpers.length; i++) {
-    preludeContents += '\n';
     preludeContents += fs.readFileSync(
       path.join(options.includesDir, helpers[i])
     );
+    preludeContents += '\n';
   }
 
   test.contents = preludeContents + test.contents;

diff --git a/lib/compilerdeps.js b/lib/compilerdeps.js
diff --git a/test/collateral/invalid-version-other-accepted/fake-test262/harness/sta.js b/test/collateral/invalid-version-other-accepted/fake-test262/harness/sta.js
@@ -0,0 +1,12 @@
+function Test262Error(message) {
+  this.message = message || "";
+}
+
+Test262Error.prototype.toString = function () {
+  return "Test262Error: " + this.message;
+};
+
+var $ERROR;
+$ERROR = function $ERROR(message) {
+  throw new Test262Error(message);
+};
diff --git a/test/collateral/invalid-version-unsupported/fake-test262/harness/sta.js b/test/collateral/invalid-version-unsupported/fake-test262/harness/sta.js
@@ -0,0 +1,12 @@
+function Test262Error(message) {
+  this.message = message || "";
+}
+
+Test262Error.prototype.toString = function () {
+  return "Test262Error: " + this.message;
+};
+
+var $ERROR;
+$ERROR = function $ERROR(message) {
+  throw new Test262Error(message);
+};
diff --git a/test/collateral/valid-default/expected-content/test/asyncNegative_default.js b/test/collateral/valid-default/expected-content/test/asyncNegative_default.js
@@ -1,21 +1,3 @@
-function Test262Error(message) {
-    if (message) this.message = message;
-}
-
-Test262Error.prototype.name = "Test262Error";
-
-Test262Error.prototype.toString = function () {
-    return "Test262Error: " + this.message;
-};
-
-function $ERROR(err) {
-  if(typeof err === "object" && err !== null && "name" in err) {
-      throw err;
-  } else {
-    throw new Test262Error(err);
-  }
-}
-
 // This is assert.js
 
 'It has some contents';
@@ -34,6 +16,19 @@ whitespace: ;
 
 void "end of assert.js";
 
+function Test262Error(message) {
+  this.message = message || "";
+}
+
+Test262Error.prototype.toString = function () {
+  return "Test262Error: " + this.message;
+};
+
+var $ERROR;
+$ERROR = function $ERROR(message) {
+  throw new Test262Error(message);
+};
+
 function $DONE(){
   if(!arguments[0])
     print('Test262:AsyncTestComplete');
@@ -42,6 +37,7 @@ function $DONE(){
 }
 
 
+
 setTimeout(function() {
   $DONE(new RangeError());
 }, 1000);
diff --git a/test/collateral/valid-default/expected-content/test/asyncNegative_strict_mode.js b/test/collateral/valid-default/expected-content/test/asyncNegative_strict_mode.js
@@ -1,22 +1,4 @@
 "use strict";
-function Test262Error(message) {
-    if (message) this.message = message;
-}
-
-Test262Error.prototype.name = "Test262Error";
-
-Test262Error.prototype.toString = function () {
-    return "Test262Error: " + this.message;
-};
-
-function $ERROR(err) {
-  if(typeof err === "object" && err !== null && "name" in err) {
-      throw err;
-  } else {
-    throw new Test262Error(err);
-  }
-}
-
 // This is assert.js
 
 'It has some contents';
@@ -35,6 +17,19 @@ whitespace: ;
 
 void "end of assert.js";
 
+function Test262Error(message) {
+  this.message = message || "";
+}
+
+Test262Error.prototype.toString = function () {
+  return "Test262Error: " + this.message;
+};
+
+var $ERROR;
+$ERROR = function $ERROR(message) {
+  throw new Test262Error(message);
+};
+
 function $DONE(){
   if(!arguments[0])
     print('Test262:AsyncTestComplete');
@@ -43,6 +38,7 @@ function $DONE(){
 }
 
 
+
 setTimeout(function() {
   $DONE(new RangeError());
 }, 1000);
diff --git a/test/collateral/valid-default/expected-content/test/async_default.js b/test/collateral/valid-default/expected-content/test/async_default.js
@@ -1,21 +1,3 @@
-function Test262Error(message) {
-    if (message) this.message = message;
-}
-
-Test262Error.prototype.name = "Test262Error";
-
-Test262Error.prototype.toString = function () {
-    return "Test262Error: " + this.message;
-};
-
-function $ERROR(err) {
-  if(typeof err === "object" && err !== null && "name" in err) {
-      throw err;
-  } else {
-    throw new Test262Error(err);
-  }
-}
-
 // This is assert.js
 
 'It has some contents';
@@ -34,6 +16,19 @@ whitespace: ;
 
 void "end of assert.js";
 
+function Test262Error(message) {
+  this.message = message || "";
+}
+
+Test262Error.prototype.toString = function () {
+  return "Test262Error: " + this.message;
+};
+
+var $ERROR;
+$ERROR = function $ERROR(message) {
+  throw new Test262Error(message);
+};
+
 function $DONE(){
   if(!arguments[0])
     print('Test262:AsyncTestComplete');
@@ -42,6 +37,7 @@ function $DONE(){
 }
 
 
+
 var p = new Promise(function(resolve) {
   resolve();
 });

diff --git a/test/collateral/valid-default/expected-content/test/async_strict_mode.js b/test/collateral/valid-default/expected-content/test/async_strict_mode.js
@@ -1,22 +1,4 @@
 "use strict";
-function Test262Error(message) {
-    if (message) this.message = message;
-}
-
-Test262Error.prototype.name = "Test262Error";
-
-Test262Error.prototype.toString = function () {
-    return "Test262Error: " + this.message;
-};
-
-function $ERROR(err) {
-  if(typeof err === "object" && err !== null && "name" in err) {
-      throw err;
-  } else {
-    throw new Test262Error(err);
-  }
-}
-
 // This is assert.js
 
 'It has some contents';
@@ -35,6 +17,19 @@ whitespace: ;
 
 void "end of assert.js";
 
+function Test262Error(message) {
+  this.message = message || "";
+}
+
+Test262Error.prototype.toString = function () {
+  return "Test262Error: " + this.message;
+};
+
+var $ERROR;
+$ERROR = function $ERROR(message) {
+  throw new Test262Error(message);
+};
+
 function $DONE(){
   if(!arguments[0])
     print('Test262:AsyncTestComplete');
@@ -43,6 +38,7 @@ function $DONE(){
 }
 
 
+
 var p = new Promise(function(resolve) {
   resolve();
 });

diff --git a/test/collateral/valid-default/expected-content/test/bothStrict_default.js b/test/collateral/valid-default/expected-content/test/bothStrict_default.js
@@ -1,21 +1,3 @@
-function Test262Error(message) {
-    if (message) this.message = message;
-}
-
-Test262Error.prototype.name = "Test262Error";
-
-Test262Error.prototype.toString = function () {
-    return "Test262Error: " + this.message;
-};
-
-function $ERROR(err) {
-  if(typeof err === "object" && err !== null && "name" in err) {
-      throw err;
-  } else {
-    throw new Test262Error(err);
-  }
-}
-
 // This is assert.js
 
 'It has some contents';
@@ -34,6 +16,20 @@ whitespace: ;
 
 void "end of assert.js";
 
+function Test262Error(message) {
+  this.message = message || "";
+}
+
+Test262Error.prototype.toString = function () {
+  return "Test262Error: " + this.message;
+};
+
+var $ERROR;
+$ERROR = function $ERROR(message) {
+  throw new Test262Error(message);
+};
+
+
 var strict;
 try { x = 1; strict = false;} catch(e) { strict = true }
 

diff --git a/test/collateral/valid-default/expected-content/test/bothStrict_strict_mode.js b/test/collateral/valid-default/expected-content/test/bothStrict_strict_mode.js
@@ -1,22 +1,4 @@
 "use strict";
-function Test262Error(message) {
-    if (message) this.message = message;
-}
-
-Test262Error.prototype.name = "Test262Error";
-
-Test262Error.prototype.toString = function () {
-    return "Test262Error: " + this.message;
-};
-
-function $ERROR(err) {
-  if(typeof err === "object" && err !== null && "name" in err) {
-      throw err;
-  } else {
-    throw new Test262Error(err);
-  }
-}
-
 // This is assert.js
 
 'It has some contents';
@@ -35,6 +17,20 @@ whitespace: ;
 
 void "end of assert.js";
 
+function Test262Error(message) {
+  this.message = message || "";
+}
+
+Test262Error.prototype.toString = function () {
+  return "Test262Error: " + this.message;
+};
+
+var $ERROR;
+$ERROR = function $ERROR(message) {
+  throw new Test262Error(message);
+};
+
+
 var strict;
 try { x = 1; strict = false;} catch(e) { strict = true }