Skip to content
Snippets Groups Projects
Commit d3d9d28c authored by David Fugate's avatar David Fugate
Browse files

Sputnik tests were previously modified to ensure global objects with common names (e.g., 'obj') 

were actually unique across the test cases.  This *was* needed prior to November as we weren't
running each test case in it's own private global environment.  The situation now is that
we're running each test within it's own iframe => the modifications are no longer needed.

Few small improvements to SputnikConverter:
- App.config file locations have been fixed
- template files get pushed alongside generated tool binaries
- the root path for Sputnik conformance files is "Conformance", not "tests"
- allow the main exe to throw exceptions so they can be properly debugged with VS
parent bd20fef7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 83 additions and 67 deletions
test/suite/sputnik_converted/07_Lexical_Conventions/7.8_Literals/7.8.5_Regular_Expression_Literals/S7.8.5_A3.1_T7.js
+ 6
− 1
View file @ d3d9d28c
......@@ -20,7 +20,12 @@ description: "IdentifierPart :: \\u0067 (g)",
test: function testcase() {
//CHECK#1
var regexp = /(?:)/\u0067;
//Test262 Change
//var regexp = /(?:)/\u0067;
var regexp;
eval('regexp = /(?:)/\\u0067;');
if (regexp.global !== true) {
$ERROR('#1: var regexp = /(?:)/\\u0067; regexp.global === true. Actual: ' + (regexp.global));
}
......
test/suite/sputnik_converted/07_Lexical_Conventions/7.8_Literals/7.8.5_Regular_Expression_Literals/S7.8.5_A3.1_T8.js
+ 7
− 1
View file @ d3d9d28c
......@@ -20,7 +20,13 @@ description: "IdentifierPart :: \\u0069 (i)",
test: function testcase() {
//CHECK#1
var regexp = /(?:)/\u0069;
//Test262 Change
//var regexp = /(?:)/\u0069;
var regexp;
eval('regexp = /(?:)/\\u0069;');
if (regexp.ignoreCase !== true) {
$ERROR('#1: var regexp = /(?:)/\\u0069; regexp.ignoreCase === true. Actual: ' + (regexp.ignoreCase));
}
......
test/suite/sputnik_converted/07_Lexical_Conventions/7.8_Literals/7.8.5_Regular_Expression_Literals/S7.8.5_A3.1_T9.js
+ 6
− 1
View file @ d3d9d28c
......@@ -20,7 +20,12 @@ description: "IdentifierPart :: \\u006D (m)",
test: function testcase() {
//CHECK#1
var regexp = /(?:)/\u006D;
//Test262 Change
//var regexp = /(?:)/\u006D;
var regexp;
eval('regexp = /(?:)/\\u006D;');
if (regexp.multiline !== true) {
$ERROR('#1: var regexp = /(?:)/\\u006D; regexp.multiline === true. Actual: ' + (regexp.multiline));
}
......
test/suite/sputnik_converted/08_Types/8.3_The_Boolean_Type/S8.3_A1_T1.js
+ 4
− 4
View file @ d3d9d28c
......@@ -19,14 +19,14 @@ path: "8.3",
description: "Assign true and false to variables",
test: function testcase() {
if (S8_3_A1_T1_x == undefined) {
$ERROR("S8_3_A1_T1_x == undefined, but actual is " + S8_3_A1_T1_x);
if (x == undefined) {
$ERROR("x == undefined, but actual is "+ x);
}
////////////////////////////////////////////////////////////////////////
// CHECK#1
var S8_3_A1_T1_x = true;
var S8_3_A1_T1_y = false;
var x = true;
var y = false;
//
////////////////////////////////////////////////////////////////////////
......
test/suite/sputnik_converted/08_Types/8.7_The_Reference_Type/S8.7.2_A3.js
+ 5
− 5
View file @ d3d9d28c
......@@ -22,16 +22,16 @@ description: "Execute this.x++, where this.x is undefined",
test: function testcase() {
//////////////////////////////////////////////////////////////////////////////
//CHECK#1
if (this.S8_7_2_A3_x !== undefined) {
$ERROR('#1: this.S8_7_2_A3_x === undefined. Actual: ' + (this.S8_7_2_A3_x));
if (this.x !== undefined) {
$ERROR('#1: this.x === undefined. Actual: ' + (this.x));
}
//
//////////////////////////////////////////////////////////////////////////////
this.S8_7_2_A3_x++;
this.x++;
//////////////////////////////////////////////////////////////////////////////
//CHECK#2
if (S8_7_2_A3_x === undefined) {
$ERROR('#2: this.S8_7_2_A3_x; this.S8_7_2_A3_x++; S8_7_2_A3_x !== undefined');
if (x === undefined) {
$ERROR('#2: this.x; this.x++; x !== undefined');
}
//
//////////////////////////////////////////////////////////////////////////////
......
test/suite/sputnik_converted/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.1_AND_Operator/S11.10.1_A2.1_T2.js
+ 3
− 3
View file @ d3d9d28c
......@@ -21,12 +21,12 @@ description: "If GetBase(x) is null, throw ReferenceError",
test: function testcase() {
//CHECK#1
try {
S11_10_1_A2_1_T2_x & 1;
$ERROR('#1.1: S11_10_1_A2_1_T2_x & 1 throw ReferenceError. Actual: ' + (S11_10_1_A2_1_T2_x & 1));
x & 1;
$ERROR('#1.1: x & 1 throw ReferenceError. Actual: ' + (x & 1));
}
catch (e) {
if ((e instanceof ReferenceError) !== true) {
$ERROR('#1.2: S11_10_1_A2_1_T2_x & 1 throw ReferenceError. Actual: ' + (e));
$ERROR('#1.2: x & 1 throw ReferenceError. Actual: ' + (e));
}
}
......
test/suite/sputnik_converted/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.1_AND_Operator/S11.10.1_A2.1_T3.js
+ 3
− 3
View file @ d3d9d28c
......@@ -21,12 +21,12 @@ description: "If GetBase(y) is null, throw ReferenceError",
test: function testcase() {
//CHECK#1
try {
1 & S11_10_1_A2_1_T3_y;
$ERROR('#1.1: 1 & y throw ReferenceError. Actual: ' + (1 & S11_10_1_A2_1_T3_y));
1 & y;
$ERROR('#1.1: 1 & y throw ReferenceError. Actual: ' + (1 & y));
}
catch (e) {
if ((e instanceof ReferenceError) !== true) {
$ERROR('#1.2: 1 & S11_10_1_A2_1_T3_y throw ReferenceError. Actual: ' + (e));
$ERROR('#1.2: 1 & y throw ReferenceError. Actual: ' + (e));
}
}
......
test/suite/sputnik_converted/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.1_AND_Operator/S11.10.1_A2.4_T3.js
+ 5
− 5
View file @ d3d9d28c
......@@ -21,18 +21,18 @@ description: "Checking with undeclarated variables",
test: function testcase() {
//CHECK#1
try {
S11_10_1_A2_4_T3_x & (S11_10_1_A2_4_T3_x = 1);
$ERROR('#1.1: S11_10_1_A2_4_T3_x & (S11_10_1_A2_4_T3_x = 1) throw ReferenceError. Actual: ' + (S11_10_1_A2_4_T3_x & (S11_10_1_A2_4_T3_x = 1)));
x & (x = 1);
$ERROR('#1.1: x & (x = 1) throw ReferenceError. Actual: ' + (x & (x = 1)));
}
catch (e) {
if ((e instanceof ReferenceError) !== true) {
$ERROR('#1.2: S11_10_1_A2_4_T3_x & (S11_10_1_A2_4_T3_x = 1) throw ReferenceError. Actual: ' + (e));
$ERROR('#1.2: x & (x = 1) throw ReferenceError. Actual: ' + (e));
}
}
//CHECK#2
if (((S11_10_1_A2_4_T3_y = 1) & S11_10_1_A2_4_T3_y) !== 1) {
$ERROR('#2: ((S11_10_1_A2_4_T3_y = 1) & S11_10_1_A2_4_T3_y) === 1. Actual: ' + (((S11_10_1_A2_4_T3_y = 1) & S11_10_1_A2_4_T3_y)));
if (((y = 1) & y) !== 1) {
$ERROR('#2: ((y = 1) & y) === 1. Actual: ' + (((y = 1) & y)));
}
......
test/suite/sputnik_converted/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.2_XOR_Operator/S11.10.2_A2.1_T2.js
+ 3
− 3
View file @ d3d9d28c
......@@ -22,12 +22,12 @@ description: "If GetBase(x) is null, throw ReferenceError",
test: function testcase() {
//CHECK#1
try {
S11_10_2_A2_1_T2_x ^ 1;
$ERROR('#1.1: S11_10_2_A2_1_T2_x ^ 1 throw ReferenceError. Actual: ' + (S11_10_2_A2_1_T2_x ^ 1));
x ^ 1;
$ERROR('#1.1: x ^ 1 throw ReferenceError. Actual: ' + (x ^ 1));
}
catch (e) {
if ((e instanceof ReferenceError) !== true) {
$ERROR('#1.2: S11_10_2_A2_1_T2_x ^ 1 throw ReferenceError. Actual: ' + (e));
$ERROR('#1.2: x ^ 1 throw ReferenceError. Actual: ' + (e));
}
}
......
test/suite/sputnik_converted/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.2_XOR_Operator/S11.10.2_A2.1_T3.js
+ 3
− 3
View file @ d3d9d28c
......@@ -21,12 +21,12 @@ description: "If GetBase(y) is null, throw ReferenceError",
test: function testcase() {
//CHECK#1
try {
1 ^ S11_10_2_A2_1_T3_y;
$ERROR('#1.1: 1 ^ S11_10_2_A2_1_T3_y throw ReferenceError. Actual: ' + (1 ^ S11_10_2_A2_1_T3_y));
1 ^ y;
$ERROR('#1.1: 1 ^ y throw ReferenceError. Actual: ' + (1 ^ y));
}
catch (e) {
if ((e instanceof ReferenceError) !== true) {
$ERROR('#1.2: 1 ^ S11_10_2_A2_1_T3_y throw ReferenceError. Actual: ' + (e));
$ERROR('#1.2: 1 ^ y throw ReferenceError. Actual: ' + (e));
}
}
......
test/suite/sputnik_converted/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.2_XOR_Operator/S11.10.2_A2.4_T3.js
+ 5
− 5
View file @ d3d9d28c
......@@ -21,18 +21,18 @@ description: "Checking with undeclarated variables",
test: function testcase() {
//CHECK#1
try {
S11_10_2_A2_4_T3_x ^ (S11_10_2_A2_4_T3_x = 1);
$ERROR('#1.1: S11_10_2_A2_4_T3_x ^ (S11_10_2_A2_4_T3_x = 1) throw ReferenceError. Actual: ' + (S11_10_2_A2_4_T3_x ^ (S11_10_2_A2_4_T3_x = 1)));
x ^ (x = 1);
$ERROR('#1.1: x ^ (x = 1) throw ReferenceError. Actual: ' + (x ^ (x = 1)));
}
catch (e) {
if ((e instanceof ReferenceError) !== true) {
$ERROR('#1.2: S11_10_2_A2_4_T3_x ^ (S11_10_2_A2_4_T3_x = 1) throw ReferenceError. Actual: ' + (e));
$ERROR('#1.2: x ^ (x = 1) throw ReferenceError. Actual: ' + (e));
}
}
//CHECK#2
if (((S11_10_2_A2_4_T3_y = 1) ^ S11_10_2_A2_4_T3_y) !== 0) {
$ERROR('#2: ((S11_10_2_A2_4_T3_y = 1) ^ S11_10_2_A2_4_T3_y) === 0. Actual: ' + (((S11_10_2_A2_4_T3_y = 1) ^ S11_10_2_A2_4_T3_y)));
if (((y = 1) ^ y) !== 0) {
$ERROR('#2: ((y = 1) ^ y) === 0. Actual: ' + (((y = 1) ^ y)));
}
......
test/suite/sputnik_converted/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.3_OR_Operator/S11.10.3_A2.1_T2.js
+ 3
− 3
View file @ d3d9d28c
......@@ -21,12 +21,12 @@ description: "If GetBase(x) is null, throw ReferenceError",
test: function testcase() {
//CHECK#1
try {
S11_10_3_A2_1_T2_x | 1;
$ERROR('#1.1: S11_10_3_A2_1_T2_x | 1 throw ReferenceError. Actual: ' + (S11_10_3_A2_1_T2_x | 1));
x | 1;
$ERROR('#1.1: x | 1 throw ReferenceError. Actual: ' + (x | 1));
}
catch (e) {
if ((e instanceof ReferenceError) !== true) {
$ERROR('#1.2: S11_10_3_A2_1_T2_x | 1 throw ReferenceError. Actual: ' + (e));
$ERROR('#1.2: x | 1 throw ReferenceError. Actual: ' + (e));
}
}
......
test/suite/sputnik_converted/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.3_OR_Operator/S11.10.3_A2.1_T3.js
+ 3
− 3
View file @ d3d9d28c
......@@ -21,12 +21,12 @@ description: "If GetBase(y) is null, throw ReferenceError",
test: function testcase() {
//CHECK#1
try {
1 | S11_10_3_A2_1_T3_y;
$ERROR('#1.1: 1 | S11_10_3_A2_1_T3_y throw ReferenceError. Actual: ' + (1 | S11_10_3_A2_1_T3_y));
1 | y;
$ERROR('#1.1: 1 | y throw ReferenceError. Actual: ' + (1 | y));
}
catch (e) {
if ((e instanceof ReferenceError) !== true) {
$ERROR('#1.2: 1 | S11_10_3_A2_1_T3_y throw ReferenceError. Actual: ' + (e));
$ERROR('#1.2: 1 | y throw ReferenceError. Actual: ' + (e));
}
}
......
test/suite/sputnik_converted/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.3_OR_Operator/S11.10.3_A2.4_T3.js
+ 5
− 5
View file @ d3d9d28c
......@@ -21,18 +21,18 @@ description: "Checking with undeclarated variables",
test: function testcase() {
//CHECK#1
try {
S11_10_3_A2_4_T3_x | (S11_10_3_A2_4_T3_x = 1);
$ERROR('#1.1: S11_10_3_A2_4_T3_x | (S11_10_3_A2_4_T3_x = 1) throw ReferenceError. Actual: ' + (S11_10_3_A2_4_T3_x | (S11_10_3_A2_4_T3_x = 1)));
x | (x = 1);
$ERROR('#1.1: x | (x = 1) throw ReferenceError. Actual: ' + (x | (x = 1)));
}
catch (e) {
if ((e instanceof ReferenceError) !== true) {
$ERROR('#1.2: S11_10_3_A2_4_T3_x | (S11_10_3_A2_4_T3_x = 1) throw ReferenceError. Actual: ' + (e));
$ERROR('#1.2: x | (x = 1) throw ReferenceError. Actual: ' + (e));
}
}
//CHECK#2
if (((S11_10_3_A2_4_T3_y = 1) | S11_10_3_A2_4_T3_y) !== 1) {
$ERROR('#2: ((S11_10_3_A2_4_T3_y = 1) | S11_10_3_A2_4_T3_y) === 1. Actual: ' + (((S11_10_3_A2_4_T3_y = 1) | S11_10_3_A2_4_T3_y)));
if (((y = 1) | y) !== 1) {
$ERROR('#2: ((y = 1) | y) === 1. Actual: ' + (((y = 1) | y)));
}
}
......
test/suite/sputnik_converted/11_Expressions/11.11_Binary_Logical_Operators/11.11.1_Logical_AND_Operator/S11.11.1_A2.1_T2.js
+ 3
− 3
View file @ d3d9d28c
......@@ -21,12 +21,12 @@ description: "If GetBase(x) is null, throw ReferenceError",
test: function testcase() {
//CHECK#1
try {
S11_11_1_A2_1_T2_x && true;
$ERROR('#1.1: S11_11_1_A2_1_T2_x && true throw ReferenceError. Actual: ' + (S11_11_1_A2_1_T2_x && true));
x && true;
$ERROR('#1.1: x && true throw ReferenceError. Actual: ' + (x && true));
}
catch (e) {
if ((e instanceof ReferenceError) !== true) {
$ERROR('#1.2: S11_11_1_A2_1_T2_x && true throw ReferenceError. Actual: ' + (e));
$ERROR('#1.2: x && true throw ReferenceError. Actual: ' + (e));
}
}
......
test/suite/sputnik_converted/11_Expressions/11.11_Binary_Logical_Operators/11.11.1_Logical_AND_Operator/S11.11.1_A2.1_T3.js
+ 3
− 3
View file @ d3d9d28c
......@@ -21,12 +21,12 @@ description: "If ToBoolean(x) is true and GetBase(y) is null, throw ReferenceErr
test: function testcase() {
//CHECK#1
try {
true && S11_11_1_A2_1_T3_y;
$ERROR('#1.1: true && S11_11_1_A2_1_T3_y throw ReferenceError. Actual: ' + (true && S11_11_1_A2_1_T3_y));
true && y;
$ERROR('#1.1: true && y throw ReferenceError. Actual: ' + (true && y));
}
catch (e) {
if ((e instanceof ReferenceError) !== true) {
$ERROR('#1.2: true && S11_11_1_A2_1_T3_y throw ReferenceError. Actual: ' + (e));
$ERROR('#1.2: true && y throw ReferenceError. Actual: ' + (e));
}
}
......
test/suite/sputnik_converted/11_Expressions/11.11_Binary_Logical_Operators/11.11.1_Logical_AND_Operator/S11.11.1_A2.4_T3.js
+ 5
− 5
View file @ d3d9d28c
......@@ -21,18 +21,18 @@ description: "Checking with undeclarated variables",
test: function testcase() {
//CHECK#1
try {
S11_11_1_A2_4_T3_x && (S11_11_1_A2_4_T3_x = true);
$ERROR('#1.1: x && (S11_11_1_A2_4_T3_x = true) throw ReferenceError. Actual: ' + (S11_11_1_A2_4_T3_x && (S11_11_1_A2_4_T3_x = true)));
x && (x = true);
$ERROR('#1.1: x && (x = true) throw ReferenceError. Actual: ' + (x && (x = true)));
}
catch (e) {
if ((e instanceof ReferenceError) !== true) {
$ERROR('#1.2: S11_11_1_A2_4_T3_x && (S11_11_1_A2_4_T3_x = true) throw ReferenceError. Actual: ' + (e));
$ERROR('#1.2: x && (x = true) throw ReferenceError. Actual: ' + (e));
}
}
//CHECK#2
if (((S11_11_1_A2_4_T3_y = true) && S11_11_1_A2_4_T3_y) !== true) {
$ERROR('#2: ((S11_11_1_A2_4_T3_y = true) && S11_11_1_A2_4_T3_y) === true');
if (((y = true) && y) !== true) {
$ERROR('#2: ((y = true) && y) === true');
}
......
test/suite/sputnik_converted/11_Expressions/11.11_Binary_Logical_Operators/11.11.2_Logical_OR_Operator/S11.11.2_A2.1_T2.js
+ 3
− 3
View file @ d3d9d28c
......@@ -21,12 +21,12 @@ description: "If GetBase(x) is null, throw ReferenceError",
test: function testcase() {
//CHECK#1
try {
S11_11_2_A2_1_T2_x || true;
$ERROR('#1.1: S11_11_2_A2_1_T2_x || true throw ReferenceError. Actual: ' + (S11_11_2_A2_1_T2_x || true));
x || true;
$ERROR('#1.1: x || true throw ReferenceError. Actual: ' + (x || true));
}
catch (e) {
if ((e instanceof ReferenceError) !== true) {
$ERROR('#1.2: S11_11_2_A2_1_T2_x || true throw ReferenceError. Actual: ' + (e));
$ERROR('#1.2: x || true throw ReferenceError. Actual: ' + (e));
}
}
......
test/suite/sputnik_converted/11_Expressions/11.11_Binary_Logical_Operators/11.11.2_Logical_OR_Operator/S11.11.2_A2.1_T3.js
+ 3
− 3
View file @ d3d9d28c
......@@ -21,12 +21,12 @@ description: "If ToBoolean(x) is false and GetBase(y) is null, throw ReferenceEr
test: function testcase() {
//CHECK#1
try {
false || S11_11_2_A2_1_T3_y;
$ERROR('#1.1: false || S11_11_2_A2_1_T3_y throw ReferenceError. Actual: ' + (false || S11_11_2_A2_1_T3_y));
false || y;
$ERROR('#1.1: false || y throw ReferenceError. Actual: ' + (false || y));
}
catch (e) {
if ((e instanceof ReferenceError) !== true) {
$ERROR('#1.2: false || S11_11_2_A2_1_T3_y throw ReferenceError. Actual: ' + (e));
$ERROR('#1.2: false || y throw ReferenceError. Actual: ' + (e));
}
}
......
test/suite/sputnik_converted/11_Expressions/11.11_Binary_Logical_Operators/11.11.2_Logical_OR_Operator/S11.11.2_A2.4_T3.js
+ 5
− 5
View file @ d3d9d28c
......@@ -21,18 +21,18 @@ description: "Checking with undeclarated variables",
test: function testcase() {
//CHECK#1
try {
S11_11_2_A2_4_T3_x || (S11_11_2_A2_4_T3_x = true);
$ERROR('#1.1: S11_11_2_A2_4_T3_x || (S11_11_2_A2_4_T3_x = true) throw ReferenceError. Actual: ' + (S11_11_2_A2_4_T3_x || (S11_11_2_A2_4_T3_x = true)));
x || (x = true);
$ERROR('#1.1: x || (x = true) throw ReferenceError. Actual: ' + (x || (x = true)));
}
catch (e) {
if ((e instanceof ReferenceError) !== true) {
$ERROR('#1.2: S11_11_2_A2_4_T3_x || (S11_11_2_A2_4_T3_x = true) throw ReferenceError. Actual: ' + (e));
$ERROR('#1.2: x || (x = true) throw ReferenceError. Actual: ' + (e));
}
}
//CHECK#2
if (((S11_11_2_A2_4_T3_y = true) || S11_11_2_A2_4_T3_y) !== true) {
$ERROR('#2: ((S11_11_2_A2_4_T3_y = true) || S11_11_2_A2_4_T3_y) === true');
if (((y = true) || y) !== true) {
$ERROR('#2: ((y = true) || y) === true');
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment