Be less clever, just use \r\n for newlines by default, tests can opt into different newlines, fix one more file casing test

This commit is contained in:
Dan Quirk 2014-07-23 03:27:56 -07:00
parent 329be5f77b
commit 3ad77c6ea0
8 changed files with 11 additions and 11 deletions

View File

@ -568,9 +568,6 @@ module Harness {
private lastErrors: MinimalDiagnostic[];
// save this away so we can reset the newline value after any tests that change it
private originalNewline = sys.newLine;
public reset() {
this.inputFiles = [];
this.settings = [];
@ -629,7 +626,7 @@ module Harness {
// always use \r\n for newlines unless the test specifies otherwise
// this ensures baseline consistency across Windows and *nix but still lets us test both \n and \r\n
sys.newLine = '\r\n';
//sys.newLine = '\r\n';
this.settings.forEach(setting => {
switch (setting.flag.toLowerCase()) {
@ -751,7 +748,6 @@ module Harness {
var sourceMapData: ts.SourceMapData[];
if (!hadParseErrors) {
sourceMapData = checker.emitFiles().sourceMaps;
sys.newLine = this.originalNewline;
}
var errors: MinimalDiagnostic[] = [];
@ -766,7 +762,7 @@ module Harness {
result.updateSourceMapRecord(program, sourceMapData);
onComplete(result);
sys.newLine = this.originalNewline;
sys.newLine = '\r\n';
return options;
}
}
@ -1133,7 +1129,7 @@ module Harness {
return filePath.indexOf('lib.d.ts') >= 0 || filePath.indexOf('lib.core.d.ts') >= 0;
}
if (Error) (<any>Error).stackTraceLimit = 100;
if (Error) (<any>Error).stackTraceLimit = 1;
}
// TODO: not sure why Utils.evalFile isn't working with this, eventually will concat it like old compiler instead of eval

View File

@ -104,4 +104,6 @@ if (runners.length === 0) {
// runners.push(new GeneratedFourslashRunner());
}
sys.newLine = '\r\n';
runTests(runners);

View File

@ -234,4 +234,5 @@
interface B extends A { }
var x: B = { };
~
!!! Type '{}' is not assignable to type 'B':\n Property 'x' is missing in type '{}'.
!!! Type '{}' is not assignable to type 'B':\n Property 'x' is missing in type '{}'.

View File

@ -228,7 +228,8 @@ Point.prototype = {
interface A { x: string; }
interface B extends A { }
var x: B = { };
var x: B = { };
//// [contextualTyping.js]
var C1T5 = (function () {\n function C1T5() {\n this.foo = function (i) {\n return i;\n };\n }\n return C1T5;\n})();\nvar C2T5;\n(function (C2T5) {\n C2T5.foo = function (i) {\n return i;\n };\n})(C2T5 || (C2T5 = {}));\nvar c3t1 = (function (s) {\n return s;\n});\nvar c3t2 = ({\n n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n return ({});\n};\nvar c3t5 = function (n) {\n return ({});\n};\nvar c3t6 = function (n, s) {\n return ({});\n};\nvar c3t7 = function (n) {\n return n;\n};\nvar c3t8 = function (n) {\n return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n return s;\n}];\nvar c3t12 = {\n foo: ({})\n};\nvar c3t13 = ({\n f: function (i, s) {\n return s;\n }\n});\nvar c3t14 = ({\n a: []\n});\nvar C4T5 = (function () {\n function C4T5() {\n this.foo = function (i, s) {\n return s;\n };\n }\n return C4T5;\n})();\nvar C5T5;\n(function (C5T5) {\n C5T5.foo;\n C5T5.foo = function (i, s) {\n return s;\n };\n})(C5T5 || (C5T5 = {}));\nvar c6t5;\nc6t5 = function (n) {\n return ({});\n};\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n return s;\n});\nobjc8.t2 = ({\n n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n return ({});\n};\nobjc8.t5 = function (n) {\n return ({});\n};\nobjc8.t6 = function (n, s) {\n return ({});\n};\nobjc8.t7 = function (n) {\n return n;\n};\nobjc8.t8 = function (n) {\n return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n return s;\n}];\nobjc8.t12 = {\n foo: ({})\n};\nobjc8.t13 = ({\n f: function (i, s) {\n return s;\n }\n});\nobjc8.t14 = ({\n a: []\n});\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n return ({});\n});\nvar c10t5 = function () {\n return function (n) {\n return ({});\n };\n};\nvar C11t5 = (function () {\n function C11t5(f) {\n }\n return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n return ({});\n});\nvar c12t1 = (function (s) {\n return s;\n});\nvar c12t2 = ({\n n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n return ({});\n};\nvar c12t5 = function (n) {\n return ({});\n};\nvar c12t6 = function (n, s) {\n return ({});\n};\nvar c12t7 = function (n) {\n return n;\n};\nvar c12t8 = function (n) {\n return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n return s;\n}];\nvar c12t12 = {\n foo: ({})\n};\nvar c12t13 = ({\n f: function (i, s) {\n return s;\n }\n});\nvar c12t14 = ({\n a: []\n});\nfunction EF1(a, b) {\n return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n this.x = x;\n this.y = y;\n return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n x: 0,\n y: 0,\n add: function (dx, dy) {\n return new Point(this.x + dx, this.y + dy);\n }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map

View File

@ -1,5 +1,5 @@
// @sourcemap: true
// @newline: \n
// @sourcemap: true
// DEFAULT INTERFACES
interface IFoo {
n: number;
@ -229,4 +229,4 @@ Point.prototype = {
interface A { x: string; }
interface B extends A { }
var x: B = { };
var x: B = { };