Fix getDefaultLibraryFile + turn off lib

sandersn · sandersn · commit 4e4f7507d096 · 2017-11-07T16:08:57.000-08:00
1. getDefaultLibraryFile should use ts to normalise the file and find
the filename.
2. lib should be turned off at the same time that noLib is turned on to
avoid a pointless error.
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(libPath: string, io: Harness.Io): Harness.Compiler.TestFile {
-        const libFile = Harness.userSpecifiedRoot + Harness.libFolder + libPath.slice(io.directoryName(libPath).length + 1);
+    export function getDefaultLibraryFile(filePath: string, io: Harness.Io): Harness.Compiler.TestFile {
+        const libFile = Harness.userSpecifiedRoot + Harness.libFolder + ts.getBaseFileName(ts.normalizeSlashes(filePath));
         return { unitName: libFile, content: io.readFile(libFile) };
     }
 
diff --git a/src/harness/rwcRunner.ts b/src/harness/rwcRunner.ts
@@ -138,6 +138,7 @@ namespace RWC {
                     }
 
                     // do not use lib since we already read it in above
+                    opts.options.lib = undefined;
                     opts.options.noLib = true;
 
                     // Emit the results

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(libPath: string, io: Harness.Io): Harness.Compiler.TestFile {`
`2150`		`- const libFile = Harness.userSpecifiedRoot + Harness.libFolder + libPath.slice(io.directoryName(libPath).length + 1);`
	`2149`	`+ export function getDefaultLibraryFile(filePath: string, io: Harness.Io): Harness.Compiler.TestFile {`
	`2150`	`+ const libFile = Harness.userSpecifiedRoot + Harness.libFolder + ts.getBaseFileName(ts.normalizeSlashes(filePath));`
`2151`	`2151`	`return { unitName: libFile, content: io.readFile(libFile) };`
`2152`	`2152`	`}`
`2153`	`2153`
Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,7 @@ namespace RWC {`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`// do not use lib since we already read it in above`
	`141`	`+ opts.options.lib = undefined;`
`141`	`142`	`opts.options.noLib = true;`
`142`	`143`
`143`	`144`	`// Emit the results`