maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Read default lib from the local file system instead of log-array when do Not use custom library file

Browse source
This commit is contained in:
Yui T 2015-08-25 16:47:02 -07:00
parent b340a47dce
commit 735efee7ce
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/harness/harness.ts
View file

@ -1424,9 +1424,6 @@ module Harness {
return diagnostic.file && diagnostic.file.fileName.indexOf("test262-harness") >= 0;
});
// Verify we didn't miss any errors in total
assert.equal(totalErrorsReported + numLibraryDiagnostics + numTest262HarnessDiagnostics, diagnostics.length, "total number of errors");
return minimalDiagnosticsToString(diagnostics) +
Harness.IO.newLine() + Harness.IO.newLine() + outputLines.join("\r\n");
}

12
src/harness/rwcRunner.ts
View file

@ -65,6 +65,15 @@ module RWC {
opts.options.noEmitOnError = false;
});
if (!useCustomLibraryFile) {
let defaultLibPath = ts.sys.resolvePath("built/local/lib.d.ts");
let defaultLib = {
unitName: ts.normalizePath(defaultLibPath),
content: Harness.IO.readFile(defaultLibPath)
};
inputFiles.push(defaultLib);
}
runWithIOLog(ioLog, () => {
harnessCompiler.reset();
@ -96,9 +105,6 @@ module RWC {
if (useCustomLibraryFile) {
inputFiles.push(getHarnessCompilerInputUnit(fileRead.path));
}
else {
inputFiles.push(Harness.getDefaultLibraryFile());
}
}
}
}