From ad18bde92bbe4307f0a2b245cc0ecd0f89fcf671 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Tue, 7 Nov 2017 15:43:55 -0800
Subject: [PATCH] RWC:Handle lib entries in tsconfig

---
 src/harness/harness.ts   | 4 ++--
 src/harness/rwcRunner.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/harness/harness.ts b/src/harness/harness.ts
index abec41ea4a..338ca6bb08 100644
--- 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
index af6e8c95c5..5613848b8e 100644
--- 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));
                                 }
                             }
                         }