Skip to content

Commit ff95731

Browse files
committed
:S
1 parent c3c758b commit ff95731

1 file changed

Lines changed: 4 additions & 6 deletions

File tree

src/harness/compilerRunner.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,8 @@ class CompilerBaselineRunner extends RunnerBase {
5050
// Everything declared here should be cleared out in the "after" callback.
5151
let justName: string;
5252

53-
let tcSettings: Harness.TestCaseParser.CompilerSettings;
54-
5553
let lastUnit: Harness.TestCaseParser.TestUnitData;
54+
let tcSettings: Harness.TestCaseParser.CompilerSettings;
5655

5756
let result: Harness.Compiler.CompilerResult;
5857
let program: ts.Program;
@@ -67,7 +66,7 @@ class CompilerBaselineRunner extends RunnerBase {
6766
const content = Harness.IO.readFile(fileName);
6867
const testCaseContent = Harness.TestCaseParser.makeUnitsFromTest(content, fileName);
6968
const units = testCaseContent.testUnitData;
70-
harnessSettings = testCaseContent.settings;
69+
const tcSettings = testCaseContent.settings;
7170
lastUnit = units[units.length - 1];
7271
const rootDir = lastUnit.originalFilePath.indexOf("conformance") === -1 ? "tests/cases/compiler/" : lastUnit.originalFilePath.substring(0, lastUnit.originalFilePath.lastIndexOf("/")) + "/";
7372
// We need to assemble the list of input files for the compiler and other related files on the 'filesystem' (ie in a multi-file test)
@@ -90,7 +89,7 @@ class CompilerBaselineRunner extends RunnerBase {
9089
}
9190

9291
const output = Harness.Compiler.HarnessCompiler.compileFiles(
93-
toBeCompiled, otherFiles, harnessSettings, /* options */ undefined, /* currentDirectory */ undefined);
92+
toBeCompiled, otherFiles, tcSettings, /* options */ undefined, /* currentDirectory */ undefined);
9493

9594
options = output.options;
9695
result = output.result;
@@ -101,7 +100,6 @@ class CompilerBaselineRunner extends RunnerBase {
101100
// Mocha holds onto the closure environment of the describe callback even after the test is done.
102101
// Therefore we have to clean out large objects after the test is done.
103102
justName = undefined;
104-
harnessSettings = undefined;
105103
lastUnit = undefined;
106104
result = undefined;
107105
program = undefined;
@@ -178,7 +176,7 @@ class CompilerBaselineRunner extends RunnerBase {
178176

179177
const declFileCompilationResult =
180178
Harness.Compiler.HarnessCompiler.compileDeclarationFiles(
181-
toBeCompiled, otherFiles, result, harnessSettings, options, /* currentDirectory */ undefined);
179+
toBeCompiled, otherFiles, result, tcSettings, options, /* currentDirectory */ undefined);
182180

183181
if (declFileCompilationResult && declFileCompilationResult.declResult.errors.length) {
184182
jsCode += "\r\n\r\n//// [DtsFileErrors]\r\n";

0 commit comments

Comments
 (0)