From f32c2eac655f5491f0094e8b401797e6ea2632fa Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 16 Oct 2019 08:37:06 -0700 Subject: [PATCH] Some changes to incremental tests --- src/testRunner/unittests/tsc/helpers.ts | 8 +++++++- src/testRunner/unittests/tsc/incremental.ts | 8 +++----- .../when-passing-filename-for-buildinfo-on-commandline.js | 2 +- .../when-passing-rootDir-from-commandline.js | 5 +++++ 4 files changed, 16 insertions(+), 7 deletions(-) rename tests/baselines/reference/tsc/incremental/{incremental-declaration-doesnt-change => no-change-run}/when-passing-filename-for-buildinfo-on-commandline.js (60%) create mode 100644 tests/baselines/reference/tsc/incremental/no-change-run/when-passing-rootDir-from-commandline.js diff --git a/src/testRunner/unittests/tsc/helpers.ts b/src/testRunner/unittests/tsc/helpers.ts index 5d5f9517e65..85eb2a886e0 100644 --- a/src/testRunner/unittests/tsc/helpers.ts +++ b/src/testRunner/unittests/tsc/helpers.ts @@ -169,9 +169,15 @@ namespace ts { Initial = "initial-build", IncrementalDtsChange = "incremental-declaration-changes", IncrementalDtsUnchanged = "incremental-declaration-doesnt-change", - IncrementalHeadersChange = "incremental-headers-change-without-dts-changes" + IncrementalHeadersChange = "incremental-headers-change-without-dts-changes", + NoChangeRun ="no-change-run" } + export const noChangeRun: TscIncremental = { + buildKind: BuildKind.NoChangeRun, + modifyFs: noop + }; + export interface TscCompile { scenario: string; subScenario: string; diff --git a/src/testRunner/unittests/tsc/incremental.ts b/src/testRunner/unittests/tsc/incremental.ts index 86d6cefe3b6..b3903b37d08 100644 --- a/src/testRunner/unittests/tsc/incremental.ts +++ b/src/testRunner/unittests/tsc/incremental.ts @@ -17,13 +17,10 @@ namespace ts { }`, }), commandLineArgs: ["--incremental", "--p", "src/project", "--tsBuildInfoFile", "src/project/.tsbuildinfo"], - incrementalScenarios: [{ - buildKind: BuildKind.IncrementalDtsUnchanged, - modifyFs: noop, - }] + incrementalScenarios: [noChangeRun] }); - verifyTsc({ + verifyTscIncrementalEdits({ scenario: "incremental", subScenario: "when passing rootDir from commandline", fs: () => loadProjectFromFiles({ @@ -37,6 +34,7 @@ namespace ts { }`, }), commandLineArgs: ["--p", "src/project", "--rootDir", "src/project/src"], + incrementalScenarios: [noChangeRun] }); }); } diff --git a/tests/baselines/reference/tsc/incremental/incremental-declaration-doesnt-change/when-passing-filename-for-buildinfo-on-commandline.js b/tests/baselines/reference/tsc/incremental/no-change-run/when-passing-filename-for-buildinfo-on-commandline.js similarity index 60% rename from tests/baselines/reference/tsc/incremental/incremental-declaration-doesnt-change/when-passing-filename-for-buildinfo-on-commandline.js rename to tests/baselines/reference/tsc/incremental/no-change-run/when-passing-filename-for-buildinfo-on-commandline.js index 2b0a9fc8793..5ebc3de7b42 100644 --- a/tests/baselines/reference/tsc/incremental/incremental-declaration-doesnt-change/when-passing-filename-for-buildinfo-on-commandline.js +++ b/tests/baselines/reference/tsc/incremental/no-change-run/when-passing-filename-for-buildinfo-on-commandline.js @@ -1,4 +1,4 @@ -//// [/lib/incremental-declaration-doesnt-changeOutput.txt] +//// [/lib/no-change-runOutput.txt] /lib/tsc --incremental --p src/project --tsBuildInfoFile src/project/.tsbuildinfo exitCode:: 0 diff --git a/tests/baselines/reference/tsc/incremental/no-change-run/when-passing-rootDir-from-commandline.js b/tests/baselines/reference/tsc/incremental/no-change-run/when-passing-rootDir-from-commandline.js new file mode 100644 index 00000000000..a20c3d3f615 --- /dev/null +++ b/tests/baselines/reference/tsc/incremental/no-change-run/when-passing-rootDir-from-commandline.js @@ -0,0 +1,5 @@ +//// [/lib/no-change-runOutput.txt] +/lib/tsc --p src/project --rootDir src/project/src +exitCode:: 0 + +