RWC:Handle lib entries in tsconfig

sandersn · sandersn · commit ad18bde92bbe · 2017-11-07T15:43:55.000-08:00
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
@@ -2146,8 +2146,8 @@ namespace Harness {
         return filePath.indexOf(Harness.libFolder) === 0;
     }
 
-    export function getDefaultLibraryFile(io: Harness.Io): Harness.Compiler.TestFile {
-        const libFile = Harness.userSpecifiedRoot + Harness.libFolder + Harness.Compiler.defaultLibFileName;
+    export function getDefaultLibraryFile(libPath: string, io: Harness.Io): Harness.Compiler.TestFile {
+        const libFile = Harness.userSpecifiedRoot + Harness.libFolder + libPath.slice(io.directoryName(libPath).length + 1);
         return { unitName: libFile, content: io.readFile(libFile) };
     }
 
diff --git a/src/harness/rwcRunner.ts b/src/harness/rwcRunner.ts
@@ -131,7 +131,7 @@ namespace RWC {
                                 }
                                 else {
                                     // set the flag to put default library to the beginning of the list
-                                    inputFiles.unshift(Harness.getDefaultLibraryFile(oldIO));
+                                    inputFiles.unshift(Harness.getDefaultLibraryFile(fileRead.path, oldIO));
                                 }
                             }
                         }

Original file line number	Diff line number	Diff line change
`@@ -2146,8 +2146,8 @@ namespace Harness {`
`2146`	`2146`	`return filePath.indexOf(Harness.libFolder) === 0;`
`2147`	`2147`	`}`
`2148`	`2148`
`2149`		`- export function getDefaultLibraryFile(io: Harness.Io): Harness.Compiler.TestFile {`
`2150`		`- const libFile = Harness.userSpecifiedRoot + Harness.libFolder + Harness.Compiler.defaultLibFileName;`
	`2149`	`+ export function getDefaultLibraryFile(libPath: string, io: Harness.Io): Harness.Compiler.TestFile {`
	`2150`	`+ const libFile = Harness.userSpecifiedRoot + Harness.libFolder + libPath.slice(io.directoryName(libPath).length + 1);`
`2151`	`2151`	`return { unitName: libFile, content: io.readFile(libFile) };`
`2152`	`2152`	`}`
`2153`	`2153`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ namespace RWC {`
`131`	`131`	`}`
`132`	`132`	`else {`
`133`	`133`	`// set the flag to put default library to the beginning of the list`
`134`		`- inputFiles.unshift(Harness.getDefaultLibraryFile(oldIO));`
	`134`	`+ inputFiles.unshift(Harness.getDefaultLibraryFile(fileRead.path, oldIO));`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`	`}`