From d3a2c2a042bd85839054fa2b6e56edb4e40a021c Mon Sep 17 00:00:00 2001 From: Jason Freeman Date: Mon, 4 May 2015 17:29:57 -0700 Subject: [PATCH 1/3] Make the harness report a failure if the line endings differ from the baselines --- src/harness/harness.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/harness/harness.ts b/src/harness/harness.ts index 8e1bdbf07ee..7d04c042fdb 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -1702,9 +1702,9 @@ module Harness { expected = IO.readFile(refFileName); } - var lineEndingSensitive = opts && opts.LineEndingSensitive; + var lineEndingInsensitive = opts && opts.LineEndingSensitive === false; // default is true - if (!lineEndingSensitive) { + if (lineEndingInsensitive) { expected = expected.replace(/\r\n?/g, '\n'); actual = actual.replace(/\r\n?/g, '\n'); } From 08cffc598c815e10f56e53654e6176cc14f836f9 Mon Sep 17 00:00:00 2001 From: Jason Freeman Date: Mon, 4 May 2015 17:30:06 -0700 Subject: [PATCH 2/3] Rebaseline tests --- .../reference/newLineFlagWithCRLF.js | 12 +++---- .../reference/newLineFlagWithCRLF.symbols | 16 +++++----- .../reference/newLineFlagWithCRLF.types | 22 ++++++------- .../baselines/reference/newLineFlagWithLF.js | 8 ++--- .../reference/newLineFlagWithLF.symbols | 16 +++++----- .../reference/newLineFlagWithLF.types | 22 ++++++------- tests/baselines/reference/noEmitHelpers.js | 32 +++++++++---------- .../baselines/reference/noEmitHelpers.symbols | 18 +++++------ tests/baselines/reference/noEmitHelpers.types | 18 +++++------ 9 files changed, 82 insertions(+), 82 deletions(-) diff --git a/tests/baselines/reference/newLineFlagWithCRLF.js b/tests/baselines/reference/newLineFlagWithCRLF.js index ebf095e5fc7..9aaaea41fad 100644 --- a/tests/baselines/reference/newLineFlagWithCRLF.js +++ b/tests/baselines/reference/newLineFlagWithCRLF.js @@ -1,9 +1,9 @@ -//// [newLineFlagWithCRLF.ts] +//// [newLineFlagWithCRLF.ts] var x=1; x=2; - - -//// [newLineFlagWithCRLF.js] -var x = 1; -x = 2; + + +//// [newLineFlagWithCRLF.js] +var x = 1; +x = 2; diff --git a/tests/baselines/reference/newLineFlagWithCRLF.symbols b/tests/baselines/reference/newLineFlagWithCRLF.symbols index 07825959fbe..0bf676067e4 100644 --- a/tests/baselines/reference/newLineFlagWithCRLF.symbols +++ b/tests/baselines/reference/newLineFlagWithCRLF.symbols @@ -1,8 +1,8 @@ -=== tests/cases/compiler/newLineFlagWithCRLF.ts === -var x=1; ->x : Symbol(x, Decl(newLineFlagWithCRLF.ts, 0, 3)) - -x=2; ->x : Symbol(x, Decl(newLineFlagWithCRLF.ts, 0, 3)) - - +=== tests/cases/compiler/newLineFlagWithCRLF.ts === +var x=1; +>x : Symbol(x, Decl(newLineFlagWithCRLF.ts, 0, 3)) + +x=2; +>x : Symbol(x, Decl(newLineFlagWithCRLF.ts, 0, 3)) + + diff --git a/tests/baselines/reference/newLineFlagWithCRLF.types b/tests/baselines/reference/newLineFlagWithCRLF.types index 2663f4bbc7b..4898d2495b2 100644 --- a/tests/baselines/reference/newLineFlagWithCRLF.types +++ b/tests/baselines/reference/newLineFlagWithCRLF.types @@ -1,11 +1,11 @@ -=== tests/cases/compiler/newLineFlagWithCRLF.ts === -var x=1; ->x : number ->1 : number - -x=2; ->x=2 : number ->x : number ->2 : number - - +=== tests/cases/compiler/newLineFlagWithCRLF.ts === +var x=1; +>x : number +>1 : number + +x=2; +>x=2 : number +>x : number +>2 : number + + diff --git a/tests/baselines/reference/newLineFlagWithLF.js b/tests/baselines/reference/newLineFlagWithLF.js index be1b9ed644e..f516cb9b7fc 100644 --- a/tests/baselines/reference/newLineFlagWithLF.js +++ b/tests/baselines/reference/newLineFlagWithLF.js @@ -1,9 +1,9 @@ -//// [newLineFlagWithLF.ts] +//// [newLineFlagWithLF.ts] var x=1; x=2; - - -//// [newLineFlagWithLF.js] + + +//// [newLineFlagWithLF.js] var x = 1; x = 2; diff --git a/tests/baselines/reference/newLineFlagWithLF.symbols b/tests/baselines/reference/newLineFlagWithLF.symbols index f4edf68dcb0..a8964eebd14 100644 --- a/tests/baselines/reference/newLineFlagWithLF.symbols +++ b/tests/baselines/reference/newLineFlagWithLF.symbols @@ -1,8 +1,8 @@ -=== tests/cases/compiler/newLineFlagWithLF.ts === -var x=1; ->x : Symbol(x, Decl(newLineFlagWithLF.ts, 0, 3)) - -x=2; ->x : Symbol(x, Decl(newLineFlagWithLF.ts, 0, 3)) - - +=== tests/cases/compiler/newLineFlagWithLF.ts === +var x=1; +>x : Symbol(x, Decl(newLineFlagWithLF.ts, 0, 3)) + +x=2; +>x : Symbol(x, Decl(newLineFlagWithLF.ts, 0, 3)) + + diff --git a/tests/baselines/reference/newLineFlagWithLF.types b/tests/baselines/reference/newLineFlagWithLF.types index 735f31d6c52..bfdf6072e0e 100644 --- a/tests/baselines/reference/newLineFlagWithLF.types +++ b/tests/baselines/reference/newLineFlagWithLF.types @@ -1,11 +1,11 @@ -=== tests/cases/compiler/newLineFlagWithLF.ts === -var x=1; ->x : number ->1 : number - -x=2; ->x=2 : number ->x : number ->2 : number - - +=== tests/cases/compiler/newLineFlagWithLF.ts === +var x=1; +>x : number +>1 : number + +x=2; +>x=2 : number +>x : number +>2 : number + + diff --git a/tests/baselines/reference/noEmitHelpers.js b/tests/baselines/reference/noEmitHelpers.js index 8db5cd862bf..bfe5a4f4445 100644 --- a/tests/baselines/reference/noEmitHelpers.js +++ b/tests/baselines/reference/noEmitHelpers.js @@ -1,19 +1,19 @@ -//// [noEmitHelpers.ts] +//// [noEmitHelpers.ts] class A { } class B extends A { } - - -//// [noEmitHelpers.js] -var A = (function () { - function A() { - } - return A; -})(); -var B = (function (_super) { - __extends(B, _super); - function B() { - _super.apply(this, arguments); - } - return B; -})(A); + + +//// [noEmitHelpers.js] +var A = (function () { + function A() { + } + return A; +})(); +var B = (function (_super) { + __extends(B, _super); + function B() { + _super.apply(this, arguments); + } + return B; +})(A); diff --git a/tests/baselines/reference/noEmitHelpers.symbols b/tests/baselines/reference/noEmitHelpers.symbols index efd281c812b..654f1a6cad5 100644 --- a/tests/baselines/reference/noEmitHelpers.symbols +++ b/tests/baselines/reference/noEmitHelpers.symbols @@ -1,9 +1,9 @@ -=== tests/cases/compiler/noEmitHelpers.ts === - -class A { } ->A : Symbol(A, Decl(noEmitHelpers.ts, 0, 0)) - -class B extends A { } ->B : Symbol(B, Decl(noEmitHelpers.ts, 1, 11)) ->A : Symbol(A, Decl(noEmitHelpers.ts, 0, 0)) - +=== tests/cases/compiler/noEmitHelpers.ts === + +class A { } +>A : Symbol(A, Decl(noEmitHelpers.ts, 0, 0)) + +class B extends A { } +>B : Symbol(B, Decl(noEmitHelpers.ts, 1, 11)) +>A : Symbol(A, Decl(noEmitHelpers.ts, 0, 0)) + diff --git a/tests/baselines/reference/noEmitHelpers.types b/tests/baselines/reference/noEmitHelpers.types index d25bd88255c..01c5d5acb3d 100644 --- a/tests/baselines/reference/noEmitHelpers.types +++ b/tests/baselines/reference/noEmitHelpers.types @@ -1,9 +1,9 @@ -=== tests/cases/compiler/noEmitHelpers.ts === - -class A { } ->A : A - -class B extends A { } ->B : B ->A : A - +=== tests/cases/compiler/noEmitHelpers.ts === + +class A { } +>A : A + +class B extends A { } +>B : B +>A : A + From a25534bd8d26c1461837c6e379dcc74991c5f5aa Mon Sep 17 00:00:00 2001 From: Jason Freeman Date: Tue, 5 May 2015 11:36:21 -0700 Subject: [PATCH 3/3] Remove unnecessary LineEndingSensitive option from BaselineOptions --- src/harness/harness.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/harness/harness.ts b/src/harness/harness.ts index 7d04c042fdb..ee4e37c19f4 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -1610,7 +1610,6 @@ module Harness { export module Baseline { export interface BaselineOptions { - LineEndingSensitive?: boolean; Subfolder?: string; Baselinefolder?: string; } @@ -1702,13 +1701,6 @@ module Harness { expected = IO.readFile(refFileName); } - var lineEndingInsensitive = opts && opts.LineEndingSensitive === false; // default is true - - if (lineEndingInsensitive) { - expected = expected.replace(/\r\n?/g, '\n'); - actual = actual.replace(/\r\n?/g, '\n'); - } - return { expected, actual }; }