Skip to content

Commit f06627f

Browse files
committed
prevent absolutre paths from leaking through error baselines
1 parent d4d6078 commit f06627f

File tree

66 files changed

+104
-104
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+104
-104
lines changed

src/harness/projectsRunner.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ class ProjectRunner extends RunnerBase {
349349
let inputFiles = ts.map(ts.filter(compilerResult.program.getSourceFiles(),
350350
sourceFile => sourceFile.fileName !== "lib.d.ts"),
351351
sourceFile => {
352-
return { unitName: sourceFile.fileName, content: sourceFile.text };
352+
return { unitName: RunnerBase.removeFullPaths(sourceFile.fileName), content: sourceFile.text };
353353
});
354354

355355
return Harness.Compiler.getErrorBaseline(inputFiles, compilerResult.errors);

tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
22

33

44
!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
5-
==== ref/m1.ts (0 errors) ====
5+
==== m1.ts (0 errors) ====
66
var m1_a1 = 10;
77
class m1_c1 {
88
public m1_c1_p1: number;
@@ -12,7 +12,7 @@ error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
1212
function m1_f1() {
1313
return m1_instance1;
1414
}
15-
==== ref/m2.ts (0 errors) ====
15+
==== m2.ts (0 errors) ====
1616
export var m2_a1 = 10;
1717
export class m2_c1 {
1818
public m2_c1_p1: number;

tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
22

33

44
!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
5-
==== ref/m1.ts (0 errors) ====
5+
==== m1.ts (0 errors) ====
66
var m1_a1 = 10;
77
class m1_c1 {
88
public m1_c1_p1: number;
@@ -12,7 +12,7 @@ error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
1212
function m1_f1() {
1313
return m1_instance1;
1414
}
15-
==== ref/m2.ts (0 errors) ====
15+
==== m2.ts (0 errors) ====
1616
export var m2_a1 = 10;
1717
export class m2_c1 {
1818
public m2_c1_p1: number;

tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
22

33

44
!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
5-
==== G:/ts/typescript/tests/cases/projects/outputdir_module_multifolder/ref/m1.ts (0 errors) ====
5+
==== m1.ts (0 errors) ====
66
export var m1_a1 = 10;
77
export class m1_c1 {
88
public m1_c1_p1: number;
@@ -12,7 +12,7 @@ error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
1212
export function m1_f1() {
1313
return m1_instance1;
1414
}
15-
==== G:/ts/typescript/tests/cases/projects/outputdir_module_multifolder_ref/m2.ts (0 errors) ====
15+
==== m2.ts (0 errors) ====
1616
export var m2_a1 = 10;
1717
export class m2_c1 {
1818
public m2_c1_p1: number;

tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
22

33

44
!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
5-
==== G:/ts/typescript/tests/cases/projects/outputdir_module_simple/m1.ts (0 errors) ====
5+
==== m1.ts (0 errors) ====
66
export var m1_a1 = 10;
77
export class m1_c1 {
88
public m1_c1_p1: number;

tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
22

33

44
!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
5-
==== G:/ts/typescript/tests/cases/projects/outputdir_module_subfolder/ref/m1.ts (0 errors) ====
5+
==== m1.ts (0 errors) ====
66
export var m1_a1 = 10;
77
export class m1_c1 {
88
public m1_c1_p1: number;

tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
22

33

44
!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
5-
==== ref/m1.ts (0 errors) ====
5+
==== m1.ts (0 errors) ====
66
var m1_a1 = 10;
77
class m1_c1 {
88
public m1_c1_p1: number;
@@ -12,7 +12,7 @@ error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
1212
function m1_f1() {
1313
return m1_instance1;
1414
}
15-
==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
15+
==== m2.ts (0 errors) ====
1616
var m2_a1 = 10;
1717
class m2_c1 {
1818
public m2_c1_p1: number;

tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
22

33

44
!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
5-
==== ref/m1.ts (0 errors) ====
5+
==== m1.ts (0 errors) ====
66
var m1_a1 = 10;
77
class m1_c1 {
88
public m1_c1_p1: number;

tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
22

33

44
!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
5-
==== ref/m1.ts (0 errors) ====
5+
==== m1.ts (0 errors) ====
66
var m1_a1 = 10;
77
class m1_c1 {
88
public m1_c1_p1: number;
@@ -12,7 +12,7 @@ error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
1212
function m1_f1() {
1313
return m1_instance1;
1414
}
15-
==== ref/m2.ts (0 errors) ====
15+
==== m2.ts (0 errors) ====
1616
export var m2_a1 = 10;
1717
export class m2_c1 {
1818
public m2_c1_p1: number;

tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
22

33

44
!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
5-
==== ref/m1.ts (0 errors) ====
5+
==== m1.ts (0 errors) ====
66
var m1_a1 = 10;
77
class m1_c1 {
88
public m1_c1_p1: number;
@@ -12,7 +12,7 @@ error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
1212
function m1_f1() {
1313
return m1_instance1;
1414
}
15-
==== ref/m2.ts (0 errors) ====
15+
==== m2.ts (0 errors) ====
1616
export var m2_a1 = 10;
1717
export class m2_c1 {
1818
public m2_c1_p1: number;

0 commit comments

Comments
 (0)