microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-06-30 15:15:38 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Get rid of disk-based paths in baselines

Browse Source
This commit is contained in:
Ryan Cavanaugh
2016-05-18 14:37:40 -07:00
parent 06bb9affd9
commit 0e273e190e
12 changed files with 90 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/harness/compilerRunner.ts
View File

@@ -107,7 +107,7 @@ class CompilerBaselineRunner extends RunnerBase {
}
const output = Harness.Compiler.compileFiles(
toBeCompiled, otherFiles, harnessSettings, /*options*/ tsConfigOptions, /*currentDirectory*/ undefined);
toBeCompiled, otherFiles, harnessSettings, /*options*/ tsConfigOptions, /*currentDirectory*/ harnessSettings['currentDirectory']);
options = output.options;
result = output.result;

1
src/harness/harness.ts
View File

@@ -953,6 +953,7 @@ namespace Harness {
{ name: "noErrorTruncation", type: "boolean" },
{ name: "suppressOutputPathCheck", type: "boolean" },
{ name: "noImplicitReferences", type: "boolean" },
{ name: "currentDirectory", type: "string" },
{ name: "symlink", type: "string" }
];

20
tests/baselines/reference/library-reference-11.trace.json
View File

@@ -1,14 +1,14 @@
[
"======== Resolving type reference directive 'jquery', containing file '/a/b/consumer.ts', root directory 'C:\\github\\TypeScript'. ========",
"Resolving with primary search path 'C:\\github\\TypeScript/types/'",
"File 'C:\\github\\TypeScript/types/jquery/package.json' does not exist.",
"File 'C:\\github\\TypeScript/types/jquery/index.d.ts' does not exist.",
"Resolving with primary search path 'C:\\github\\TypeScript/node_modules/'",
"File 'C:\\github\\TypeScript/node_modules/jquery/package.json' does not exist.",
"File 'C:\\github\\TypeScript/node_modules/jquery/index.d.ts' does not exist.",
"Resolving with primary search path 'C:\\github\\TypeScript/node_modules/@types/'",
"File 'C:\\github\\TypeScript/node_modules/@types/jquery/package.json' does not exist.",
"File 'C:\\github\\TypeScript/node_modules/@types/jquery/index.d.ts' does not exist.",
"======== Resolving type reference directive 'jquery', containing file '/a/b/consumer.ts', root directory '/'. ========",
"Resolving with primary search path '/types/'",
"File '/types/jquery/package.json' does not exist.",
"File '/types/jquery/index.d.ts' does not exist.",
"Resolving with primary search path '/node_modules/'",
"File '/node_modules/jquery/package.json' does not exist.",
"File '/node_modules/jquery/index.d.ts' does not exist.",
"Resolving with primary search path '/node_modules/@types/'",
"File '/node_modules/@types/jquery/package.json' does not exist.",
"File '/node_modules/@types/jquery/index.d.ts' does not exist.",
"Looking up in 'node_modules' folder, initial location '/a/b'",
"File '/a/b/node_modules/jquery.ts' does not exist.",
"File '/a/b/node_modules/jquery.d.ts' does not exist.",

20
tests/baselines/reference/library-reference-12.trace.json
View File

@@ -1,14 +1,14 @@
[
"======== Resolving type reference directive 'jquery', containing file '/a/b/consumer.ts', root directory 'C:\\github\\TypeScript'. ========",
"Resolving with primary search path 'C:\\github\\TypeScript/types/'",
"File 'C:\\github\\TypeScript/types/jquery/package.json' does not exist.",
"File 'C:\\github\\TypeScript/types/jquery/index.d.ts' does not exist.",
"Resolving with primary search path 'C:\\github\\TypeScript/node_modules/'",
"File 'C:\\github\\TypeScript/node_modules/jquery/package.json' does not exist.",
"File 'C:\\github\\TypeScript/node_modules/jquery/index.d.ts' does not exist.",
"Resolving with primary search path 'C:\\github\\TypeScript/node_modules/@types/'",
"File 'C:\\github\\TypeScript/node_modules/@types/jquery/package.json' does not exist.",
"File 'C:\\github\\TypeScript/node_modules/@types/jquery/index.d.ts' does not exist.",
"======== Resolving type reference directive 'jquery', containing file '/a/b/consumer.ts', root directory '/'. ========",
"Resolving with primary search path '/types/'",
"File '/types/jquery/package.json' does not exist.",
"File '/types/jquery/index.d.ts' does not exist.",
"Resolving with primary search path '/node_modules/'",
"File '/node_modules/jquery/package.json' does not exist.",
"File '/node_modules/jquery/index.d.ts' does not exist.",
"Resolving with primary search path '/node_modules/@types/'",
"File '/node_modules/@types/jquery/package.json' does not exist.",
"File '/node_modules/@types/jquery/index.d.ts' does not exist.",
"Looking up in 'node_modules' folder, initial location '/a/b'",
"File '/a/b/node_modules/jquery.ts' does not exist.",
"File '/a/b/node_modules/jquery.d.ts' does not exist.",

62
tests/baselines/reference/library-reference-15.trace.json
View File

@@ -1,44 +1,24 @@
[
"======== Resolving type reference directive 'jquery', containing file not set, root directory 'C:\\github\\TypeScript'. ========",
"Resolving with primary search path 'C:\\github\\TypeScript/types/'",
"File 'C:\\github\\TypeScript/types/jquery/package.json' does not exist.",
"File 'C:\\github\\TypeScript/types/jquery/index.d.ts' does not exist.",
"Resolving with primary search path 'C:\\github\\TypeScript/node_modules/'",
"File 'C:\\github\\TypeScript/node_modules/jquery/package.json' does not exist.",
"File 'C:\\github\\TypeScript/node_modules/jquery/index.d.ts' does not exist.",
"Resolving with primary search path 'C:\\github\\TypeScript/node_modules/@types/'",
"File 'C:\\github\\TypeScript/node_modules/@types/jquery/package.json' does not exist.",
"File 'C:\\github\\TypeScript/node_modules/@types/jquery/index.d.ts' does not exist.",
"Looking up in 'node_modules' folder, initial location 'C:\\github\\TypeScript'",
"File 'C:/github/TypeScript/node_modules/jquery.ts' does not exist.",
"File 'C:/github/TypeScript/node_modules/jquery.d.ts' does not exist.",
"File 'C:/github/TypeScript/node_modules/jquery/package.json' does not exist.",
"File 'C:/github/TypeScript/node_modules/jquery/index.ts' does not exist.",
"File 'C:/github/TypeScript/node_modules/jquery/index.d.ts' does not exist.",
"File 'C:/github/TypeScript/node_modules/@types/jquery.ts' does not exist.",
"File 'C:/github/TypeScript/node_modules/@types/jquery.d.ts' does not exist.",
"File 'C:/github/TypeScript/node_modules/@types/jquery/package.json' does not exist.",
"File 'C:/github/TypeScript/node_modules/@types/jquery/index.ts' does not exist.",
"File 'C:/github/TypeScript/node_modules/@types/jquery/index.d.ts' does not exist.",
"File 'C:/github/node_modules/jquery.ts' does not exist.",
"File 'C:/github/node_modules/jquery.d.ts' does not exist.",
"File 'C:/github/node_modules/jquery/package.json' does not exist.",
"File 'C:/github/node_modules/jquery/index.ts' does not exist.",
"File 'C:/github/node_modules/jquery/index.d.ts' does not exist.",
"File 'C:/github/node_modules/@types/jquery.ts' does not exist.",
"File 'C:/github/node_modules/@types/jquery.d.ts' does not exist.",
"File 'C:/github/node_modules/@types/jquery/package.json' does not exist.",
"File 'C:/github/node_modules/@types/jquery/index.ts' does not exist.",
"File 'C:/github/node_modules/@types/jquery/index.d.ts' does not exist.",
"File 'C:/node_modules/jquery.ts' does not exist.",
"File 'C:/node_modules/jquery.d.ts' does not exist.",
"File 'C:/node_modules/jquery/package.json' does not exist.",
"File 'C:/node_modules/jquery/index.ts' does not exist.",
"File 'C:/node_modules/jquery/index.d.ts' does not exist.",
"File 'C:/node_modules/@types/jquery.ts' does not exist.",
"File 'C:/node_modules/@types/jquery.d.ts' does not exist.",
"File 'C:/node_modules/@types/jquery/package.json' does not exist.",
"File 'C:/node_modules/@types/jquery/index.ts' does not exist.",
"File 'C:/node_modules/@types/jquery/index.d.ts' does not exist.",
"======== Resolving type reference directive 'jquery', containing file not set, root directory '/'. ========",
"Resolving with primary search path '/types/'",
"File '/types/jquery/package.json' does not exist.",
"File '/types/jquery/index.d.ts' does not exist.",
"Resolving with primary search path '/node_modules/'",
"File '/node_modules/jquery/package.json' does not exist.",
"File '/node_modules/jquery/index.d.ts' does not exist.",
"Resolving with primary search path '/node_modules/@types/'",
"File '/node_modules/@types/jquery/package.json' does not exist.",
"File '/node_modules/@types/jquery/index.d.ts' does not exist.",
"Looking up in 'node_modules' folder, initial location '/'",
"File '/node_modules/jquery.ts' does not exist.",
"File '/node_modules/jquery.d.ts' does not exist.",
"File '/node_modules/jquery/package.json' does not exist.",
"File '/node_modules/jquery/index.ts' does not exist.",
"File '/node_modules/jquery/index.d.ts' does not exist.",
"File '/node_modules/@types/jquery.ts' does not exist.",
"File '/node_modules/@types/jquery.d.ts' does not exist.",
"File '/node_modules/@types/jquery/package.json' does not exist.",
"File '/node_modules/@types/jquery/index.ts' does not exist.",
"File '/node_modules/@types/jquery/index.d.ts' does not exist.",
"======== Type reference directive 'jquery' was not resolved. ========"
]

102
tests/baselines/reference/library-reference-5.trace.json
View File

@@ -1,68 +1,30 @@
[
"======== Resolving type reference directive 'foo', containing file '/src/root.ts', root directory 'C:\\github\\TypeScript'. ========",
"Resolving with primary search path 'C:\\github\\TypeScript/types/'",
"File 'C:\\github\\TypeScript/types/foo/package.json' does not exist.",
"File 'C:\\github\\TypeScript/types/foo/index.d.ts' does not exist.",
"Resolving with primary search path 'C:\\github\\TypeScript/node_modules/'",
"File 'C:\\github\\TypeScript/node_modules/foo/package.json' does not exist.",
"File 'C:\\github\\TypeScript/node_modules/foo/index.d.ts' does not exist.",
"Resolving with primary search path 'C:\\github\\TypeScript/node_modules/@types/'",
"File 'C:\\github\\TypeScript/node_modules/@types/foo/package.json' does not exist.",
"File 'C:\\github\\TypeScript/node_modules/@types/foo/index.d.ts' does not exist.",
"Looking up in 'node_modules' folder, initial location '/src'",
"File '/src/node_modules/foo.ts' does not exist.",
"File '/src/node_modules/foo.d.ts' does not exist.",
"File '/src/node_modules/foo/package.json' does not exist.",
"File '/src/node_modules/foo/index.ts' does not exist.",
"File '/src/node_modules/foo/index.d.ts' does not exist.",
"File '/src/node_modules/@types/foo.ts' does not exist.",
"File '/src/node_modules/@types/foo.d.ts' does not exist.",
"File '/src/node_modules/@types/foo/package.json' does not exist.",
"File '/src/node_modules/@types/foo/index.ts' does not exist.",
"File '/src/node_modules/@types/foo/index.d.ts' does not exist.",
"File '/node_modules/foo.ts' does not exist.",
"File '/node_modules/foo.d.ts' does not exist.",
"======== Resolving type reference directive 'foo', containing file '/src/root.ts', root directory '/'. ========",
"Resolving with primary search path '/types/'",
"File '/types/foo/package.json' does not exist.",
"File '/types/foo/index.d.ts' does not exist.",
"Resolving with primary search path '/node_modules/'",
"File '/node_modules/foo/package.json' does not exist.",
"File '/node_modules/foo/index.ts' does not exist.",
"File '/node_modules/foo/index.d.ts' exist - use it as a name resolution result.",
"======== Type reference directive 'foo' was successfully resolved to '/node_modules/foo/index.d.ts', primary: false. ========",
"======== Resolving type reference directive 'bar', containing file '/src/root.ts', root directory 'C:\\github\\TypeScript'. ========",
"Resolving with primary search path 'C:\\github\\TypeScript/types/'",
"File 'C:\\github\\TypeScript/types/bar/package.json' does not exist.",
"File 'C:\\github\\TypeScript/types/bar/index.d.ts' does not exist.",
"Resolving with primary search path 'C:\\github\\TypeScript/node_modules/'",
"File 'C:\\github\\TypeScript/node_modules/bar/package.json' does not exist.",
"File 'C:\\github\\TypeScript/node_modules/bar/index.d.ts' does not exist.",
"Resolving with primary search path 'C:\\github\\TypeScript/node_modules/@types/'",
"File 'C:\\github\\TypeScript/node_modules/@types/bar/package.json' does not exist.",
"File 'C:\\github\\TypeScript/node_modules/@types/bar/index.d.ts' does not exist.",
"Looking up in 'node_modules' folder, initial location '/src'",
"File '/src/node_modules/bar.ts' does not exist.",
"File '/src/node_modules/bar.d.ts' does not exist.",
"File '/src/node_modules/bar/package.json' does not exist.",
"File '/src/node_modules/bar/index.ts' does not exist.",
"File '/src/node_modules/bar/index.d.ts' does not exist.",
"File '/src/node_modules/@types/bar.ts' does not exist.",
"File '/src/node_modules/@types/bar.d.ts' does not exist.",
"File '/src/node_modules/@types/bar/package.json' does not exist.",
"File '/src/node_modules/@types/bar/index.ts' does not exist.",
"File '/src/node_modules/@types/bar/index.d.ts' does not exist.",
"File '/node_modules/bar.ts' does not exist.",
"File '/node_modules/bar.d.ts' does not exist.",
"======== Type reference directive 'foo' was successfully resolved to '/node_modules/foo/index.d.ts', primary: true. ========",
"======== Resolving type reference directive 'bar', containing file '/src/root.ts', root directory '/'. ========",
"Resolving with primary search path '/types/'",
"File '/types/bar/package.json' does not exist.",
"File '/types/bar/index.d.ts' does not exist.",
"Resolving with primary search path '/node_modules/'",
"File '/node_modules/bar/package.json' does not exist.",
"File '/node_modules/bar/index.ts' does not exist.",
"File '/node_modules/bar/index.d.ts' exist - use it as a name resolution result.",
"======== Type reference directive 'bar' was successfully resolved to '/node_modules/bar/index.d.ts', primary: false. ========",
"======== Resolving type reference directive 'alpha', containing file '/node_modules/foo/index.d.ts', root directory 'C:\\github\\TypeScript'. ========",
"Resolving with primary search path 'C:\\github\\TypeScript/types/'",
"File 'C:\\github\\TypeScript/types/alpha/package.json' does not exist.",
"File 'C:\\github\\TypeScript/types/alpha/index.d.ts' does not exist.",
"Resolving with primary search path 'C:\\github\\TypeScript/node_modules/'",
"File 'C:\\github\\TypeScript/node_modules/alpha/package.json' does not exist.",
"File 'C:\\github\\TypeScript/node_modules/alpha/index.d.ts' does not exist.",
"Resolving with primary search path 'C:\\github\\TypeScript/node_modules/@types/'",
"File 'C:\\github\\TypeScript/node_modules/@types/alpha/package.json' does not exist.",
"File 'C:\\github\\TypeScript/node_modules/@types/alpha/index.d.ts' does not exist.",
"======== Type reference directive 'bar' was successfully resolved to '/node_modules/bar/index.d.ts', primary: true. ========",
"======== Resolving type reference directive 'alpha', containing file '/node_modules/foo/index.d.ts', root directory '/'. ========",
"Resolving with primary search path '/types/'",
"File '/types/alpha/package.json' does not exist.",
"File '/types/alpha/index.d.ts' does not exist.",
"Resolving with primary search path '/node_modules/'",
"File '/node_modules/alpha/package.json' does not exist.",
"File '/node_modules/alpha/index.d.ts' does not exist.",
"Resolving with primary search path '/node_modules/@types/'",
"File '/node_modules/@types/alpha/package.json' does not exist.",
"File '/node_modules/@types/alpha/index.d.ts' does not exist.",
"Looking up in 'node_modules' folder, initial location '/node_modules/foo'",
"File '/node_modules/foo/node_modules/alpha.ts' does not exist.",
"File '/node_modules/foo/node_modules/alpha.d.ts' does not exist.",
@@ -70,16 +32,16 @@
"File '/node_modules/foo/node_modules/alpha/index.ts' does not exist.",
"File '/node_modules/foo/node_modules/alpha/index.d.ts' exist - use it as a name resolution result.",
"======== Type reference directive 'alpha' was successfully resolved to '/node_modules/foo/node_modules/alpha/index.d.ts', primary: false. ========",
"======== Resolving type reference directive 'alpha', containing file '/node_modules/bar/index.d.ts', root directory 'C:\\github\\TypeScript'. ========",
"Resolving with primary search path 'C:\\github\\TypeScript/types/'",
"File 'C:\\github\\TypeScript/types/alpha/package.json' does not exist.",
"File 'C:\\github\\TypeScript/types/alpha/index.d.ts' does not exist.",
"Resolving with primary search path 'C:\\github\\TypeScript/node_modules/'",
"File 'C:\\github\\TypeScript/node_modules/alpha/package.json' does not exist.",
"File 'C:\\github\\TypeScript/node_modules/alpha/index.d.ts' does not exist.",
"Resolving with primary search path 'C:\\github\\TypeScript/node_modules/@types/'",
"File 'C:\\github\\TypeScript/node_modules/@types/alpha/package.json' does not exist.",
"File 'C:\\github\\TypeScript/node_modules/@types/alpha/index.d.ts' does not exist.",
"======== Resolving type reference directive 'alpha', containing file '/node_modules/bar/index.d.ts', root directory '/'. ========",
"Resolving with primary search path '/types/'",
"File '/types/alpha/package.json' does not exist.",
"File '/types/alpha/index.d.ts' does not exist.",
"Resolving with primary search path '/node_modules/'",
"File '/node_modules/alpha/package.json' does not exist.",
"File '/node_modules/alpha/index.d.ts' does not exist.",
"Resolving with primary search path '/node_modules/@types/'",
"File '/node_modules/@types/alpha/package.json' does not exist.",
"File '/node_modules/@types/alpha/index.d.ts' does not exist.",
"Looking up in 'node_modules' folder, initial location '/node_modules/bar'",
"File '/node_modules/bar/node_modules/alpha.ts' does not exist.",
"File '/node_modules/bar/node_modules/alpha.d.ts' does not exist.",

20
tests/baselines/reference/library-reference-7.trace.json
View File

@@ -1,14 +1,14 @@
[
"======== Resolving type reference directive 'jquery', containing file '/src/consumer.ts', root directory 'C:\\github\\TypeScript'. ========",
"Resolving with primary search path 'C:\\github\\TypeScript/types/'",
"File 'C:\\github\\TypeScript/types/jquery/package.json' does not exist.",
"File 'C:\\github\\TypeScript/types/jquery/index.d.ts' does not exist.",
"Resolving with primary search path 'C:\\github\\TypeScript/node_modules/'",
"File 'C:\\github\\TypeScript/node_modules/jquery/package.json' does not exist.",
"File 'C:\\github\\TypeScript/node_modules/jquery/index.d.ts' does not exist.",
"Resolving with primary search path 'C:\\github\\TypeScript/node_modules/@types/'",
"File 'C:\\github\\TypeScript/node_modules/@types/jquery/package.json' does not exist.",
"File 'C:\\github\\TypeScript/node_modules/@types/jquery/index.d.ts' does not exist.",
"======== Resolving type reference directive 'jquery', containing file '/src/consumer.ts', root directory '/'. ========",
"Resolving with primary search path '/types/'",
"File '/types/jquery/package.json' does not exist.",
"File '/types/jquery/index.d.ts' does not exist.",
"Resolving with primary search path '/node_modules/'",
"File '/node_modules/jquery/package.json' does not exist.",
"File '/node_modules/jquery/index.d.ts' does not exist.",
"Resolving with primary search path '/node_modules/@types/'",
"File '/node_modules/@types/jquery/package.json' does not exist.",
"File '/node_modules/@types/jquery/index.d.ts' does not exist.",
"Looking up in 'node_modules' folder, initial location '/src'",
"File '/src/node_modules/jquery.ts' does not exist.",
"File '/src/node_modules/jquery.d.ts' does not exist.",

1
tests/cases/conformance/references/library-reference-11.ts
View File

@@ -1,5 +1,6 @@
// @noImplicitReferences: true
// @traceResolution: true
// @currentDirectory: /
// package.json in a secondary reference can refer to another file

1
tests/cases/conformance/references/library-reference-12.ts
View File

@@ -1,5 +1,6 @@
// @noImplicitReferences: true
// @traceResolution: true
// @currentDirectory: /
// package.json in a secondary reference can refer to another file

1
tests/cases/conformance/references/library-reference-15.ts
View File

@@ -1,6 +1,7 @@
// @noImplicitReferences: true
// @traceResolution: true
// @types: jquery
// @currentDirectory: /
// @filename: /a/types/jquery/index.d.ts
declare var $: { foo(): void };

1
tests/cases/conformance/references/library-reference-5.ts
View File

@@ -1,5 +1,6 @@
// @noImplicitReferences: true
// @traceResolution: true
// @currentDirectory: /
// Secondary references may not be duplicated if they disagree in content

1
tests/cases/conformance/references/library-reference-7.ts
View File

@@ -1,5 +1,6 @@
// @noImplicitReferences: true
// @traceResolution: true
// @currentDirectory: /
// Secondary references are possible