From a0206ec98329780883d444c8c3ac9355f35670af Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Wed, 21 Sep 2016 15:20:00 -0700 Subject: [PATCH] Correctly remove stale .error.txt baselines --- src/harness/compilerRunner.ts | 4 +--- src/harness/harness.ts | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/harness/compilerRunner.ts b/src/harness/compilerRunner.ts index 63e01f0f81483..70c6fdac32984 100644 --- a/src/harness/compilerRunner.ts +++ b/src/harness/compilerRunner.ts @@ -136,9 +136,7 @@ class CompilerBaselineRunner extends RunnerBase { // check errors it("Correct errors for " + fileName, () => { - if (this.errors) { - Harness.Compiler.doErrorBaseline(justName, toBeCompiled.concat(otherFiles), result.errors); - } + Harness.Compiler.doErrorBaseline(justName, toBeCompiled.concat(otherFiles), result.errors); }); it (`Correct module resolution tracing for ${fileName}`, () => { diff --git a/src/harness/harness.ts b/src/harness/harness.ts index 0863c58851df9..b4fd8736b2f7d 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -1407,7 +1407,7 @@ namespace Harness { export function doErrorBaseline(baselinePath: string, inputFiles: TestFile[], errors: ts.Diagnostic[]) { Harness.Baseline.runBaseline(baselinePath.replace(/\.tsx?$/, ".errors.txt"), (): string => { - if (errors.length === 0) { + if (!errors || (errors.length === 0)) { /* tslint:disable:no-null-keyword */ return null; /* tslint:enable:no-null-keyword */