Skip to content

Commit bfc4f7a

Browse files
sheetalkamatsheetalkamat
committed
Get the last output from the written files
1 parent 1f149cc commit bfc4f7a

File tree

8 files changed

+5
-18
lines changed

8 files changed

+5
-18
lines changed

‎src/testRunner/unittests/tsbuild/amdModulesWithOut.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ namespace ts {
7272
[outputFiles[project.lib][ext.buildinfo], outputFiles[project.lib][ext.js], outputFiles[project.lib][ext.dts]],
7373
[outputFiles[project.app][ext.buildinfo], outputFiles[project.app][ext.js], outputFiles[project.app][ext.dts]]
7474
],
75-
lastProjectOutput: outputFiles[project.app][ext.js],
7675
initialBuild: {
7776
modifyFs
7877
},
@@ -217,7 +216,6 @@ ${internal} export enum internalEnum { a, b, c }`);
217216
[libOutputFile[ext.buildinfo], libOutputFile[ext.js], libOutputFile[ext.dts]],
218217
[outputFiles[project.app][ext.buildinfo], outputFiles[project.app][ext.js], outputFiles[project.app][ext.dts]]
219218
],
220-
lastProjectOutput: outputFiles[project.app][ext.js],
221219
initialBuild: {
222220
modifyFs,
223221
expectedDiagnostics: [

‎src/testRunner/unittests/tsbuild/emitDeclarationOnly.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ namespace ts {
1717
tick,
1818
proj: "emitDeclarationOnly",
1919
rootNames: ["/src"],
20-
lastProjectOutput: `/src/lib/index.d.ts`,
2120
initialBuild: {
2221
modifyFs: disableMap ?
2322
(fs => replaceText(fs, "/src/tsconfig.json", `"declarationMap": true,`, "")) :
@@ -50,7 +49,6 @@ namespace ts {
5049
tick,
5150
proj: "emitDeclarationOnly",
5251
rootNames: ["/src"],
53-
lastProjectOutput: `/src/lib/a.d.ts`,
5452
initialBuild: {
5553
modifyFs: fs => {
5654
fs.rimrafSync("/src/src/index.ts");

‎src/testRunner/unittests/tsbuild/helpers.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,6 @@ Mismatch Actual(path, actual, expected): ${JSON.stringify(arrayFrom(mapDefinedIt
312312
proj: string;
313313
rootNames: ReadonlyArray<string>;
314314
expectedBuildInfoFilesForSectionBaselines?: ReadonlyArray<BuildInfoSectionBaselineFiles>;
315-
lastProjectOutput: string;
316315
initialBuild: BuildState;
317316
incrementalDtsChangedBuild?: BuildState;
318317
incrementalDtsUnchangedBuild?: BuildState;
@@ -324,14 +323,15 @@ Mismatch Actual(path, actual, expected): ${JSON.stringify(arrayFrom(mapDefinedIt
324323

325324
export function verifyTsbuildOutput({
326325
scenario, projFs, time, tick, proj, rootNames, baselineOnly, verifyDiagnostics,
327-
baselineSourceMap, expectedBuildInfoFilesForSectionBaselines, lastProjectOutput,
326+
baselineSourceMap, expectedBuildInfoFilesForSectionBaselines,
328327
initialBuild, incrementalDtsChangedBuild, incrementalDtsUnchangedBuild, incrementalHeaderChangedBuild
329328
}: VerifyTsBuildInput) {
330329
describe(`tsc --b ${proj}:: ${scenario}`, () => {
331330
let fs: vfs.FileSystem;
332331
let actualReadFileMap: Map<number>;
333332
let firstBuildTime: number;
334333
let host: fakes.SolutionBuilderHost;
334+
let initialWrittenFiles: Map<true>;
335335
before(() => {
336336
const result = build({
337337
fs: projFs().shadow(),
@@ -341,13 +341,14 @@ Mismatch Actual(path, actual, expected): ${JSON.stringify(arrayFrom(mapDefinedIt
341341
expectedBuildInfoFilesForSectionBaselines,
342342
modifyFs: initialBuild.modifyFs,
343343
});
344-
({ fs, actualReadFileMap, host } = result);
344+
({ fs, actualReadFileMap, host, writtenFiles: initialWrittenFiles } = result);
345345
firstBuildTime = time();
346346
});
347347
after(() => {
348348
fs = undefined!;
349349
actualReadFileMap = undefined!;
350350
host = undefined!;
351+
initialWrittenFiles = undefined!;
351352
});
352353
describe("initialBuild", () => {
353354
if (!baselineOnly || verifyDiagnostics) {
@@ -373,6 +374,7 @@ Mismatch Actual(path, actual, expected): ${JSON.stringify(arrayFrom(mapDefinedIt
373374
let beforeBuildTime: number;
374375
let afterBuildTime: number;
375376
before(() => {
377+
const lastProjectOutput = last(arrayFrom(initialWrittenFiles.keys()));
376378
beforeBuildTime = fs.statSync(lastProjectOutput).mtimeMs;
377379
tick();
378380
newFs = fs.shadow();

‎src/testRunner/unittests/tsbuild/inferredTypeFromTransitiveModule.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ namespace ts {
1616
tick,
1717
proj: "inferredTypeFromTransitiveModule",
1818
rootNames: ["/src"],
19-
lastProjectOutput: `/src/obj/index.js`,
2019
initialBuild: {
2120
modifyFs: noop,
2221
expectedDiagnostics: [

‎src/testRunner/unittests/tsbuild/lateBoundSymbol.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ namespace ts {
1616
tick,
1717
proj: "lateBoundSymbol",
1818
rootNames: ["/src/tsconfig.json"],
19-
lastProjectOutput: "/src/src/main.js",
2019
initialBuild: {
2120
modifyFs: noop,
2221
expectedDiagnostics: [

‎src/testRunner/unittests/tsbuild/moduleSpecifiers.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ namespace ts {
9696
tick,
9797
proj: "moduleSpecifiers",
9898
rootNames: ["/"],
99-
lastProjectOutput: `/src/lib/index.d.ts`,
10099
initialBuild: {
101100
modifyFs: noop,
102101
},

‎src/testRunner/unittests/tsbuild/outFile.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,6 @@ namespace ts {
280280
rootNames: ["/src/third"],
281281
baselineSourceMap: true,
282282
expectedBuildInfoFilesForSectionBaselines: expectedBuildInfoFilesForSectionBaselines || expectedTsbuildInfoFileNames,
283-
lastProjectOutput: outputFiles[project.third][ext.js],
284283
initialBuild: {
285284
modifyFs,
286285
expectedDiagnostics: initialExpectedDiagnostics,

‎src/testRunner/unittests/tsbuild/sample.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,6 @@ export class cNew {}`);
613613
proj: "sample1",
614614
rootNames: ["/src/tests"],
615615
baselineSourceMap: true,
616-
lastProjectOutput: "/src/tests/index.js",
617616
initialBuild,
618617
incrementalDtsChangedBuild: {
619618
modifyFs: fs => appendText(fs, "/src/core/index.ts", `
@@ -703,7 +702,6 @@ class someClass { }`),
703702
proj: "sample1",
704703
rootNames: ["/src/tests"],
705704
baselineSourceMap: true,
706-
lastProjectOutput: "/src/tests/index.js",
707705
initialBuild,
708706
incrementalDtsChangedBuild: {
709707
modifyFs: fs => replaceText(fs, "/src/logic/tsconfig.json", `"declaration": true,`, `"declaration": true,
@@ -751,7 +749,6 @@ class someClass { }`),
751749
proj: "sample1",
752750
rootNames: ["/src/tests"],
753751
baselineSourceMap: true,
754-
lastProjectOutput: "/src/tests/index.js",
755752
initialBuild: {
756753
modifyFs: fs => replaceText(fs, "/src/logic/tsconfig.json", `"composite": true,`, `"composite": true,
757754
"tsBuildInfoFile": "ownFile.tsbuildinfo",`),
@@ -791,7 +788,6 @@ class someClass { }`),
791788
tick,
792789
proj: "sample1",
793790
rootNames: ["/src/core"],
794-
lastProjectOutput: "/src/core/index.js",
795791
initialBuild: {
796792
modifyFs: fs => fs.writeFileSync("/src/core/tsconfig.json", `{
797793
"compilerOptions": {
@@ -824,7 +820,6 @@ class someClass { }`),
824820
tick,
825821
proj: "sample1",
826822
rootNames: ["/src/core"],
827-
lastProjectOutput: "/src/core/index.js",
828823
initialBuild: {
829824
modifyFs: fs => {
830825
fs.writeFileSync("/lib/lib.esnext.full.d.ts", `/// <reference no-default-lib="true"/>
@@ -866,7 +861,6 @@ class someClass { }`),
866861
tick,
867862
proj: "sample1",
868863
rootNames: ["/src/core"],
869-
lastProjectOutput: "/src/core/index.js",
870864
initialBuild: {
871865
modifyFs: fs => fs.writeFileSync("/src/core/tsconfig.json", `{
872866
"compilerOptions": {
@@ -899,7 +893,6 @@ class someClass { }`),
899893
tick,
900894
proj: "sample1",
901895
rootNames: ["/src/tests"],
902-
lastProjectOutput: "/src/tests/index.js",
903896
initialBuild: {
904897
modifyFs: fs => fs.writeFileSync("/src/tests/tsconfig.json", `{
905898
"references": [

0 commit comments

Comments
 (0)