Skip to content

Commit 702b27b

Browse files
committed
fixed build breaks in perftc
1 parent 893940c commit 702b27b

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

tests/perfsys.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,24 @@ module perftest {
88

99
export interface IO {
1010
getOut(): string;
11-
getErr(): string;
1211
}
1312

1413
export var readFile = sys.readFile;
1514
var writeFile = sys.writeFile;
1615
export var write = sys.write;
17-
export var writeErr = sys.writeErr;
1816
var resolvePath = sys.resolvePath;
1917
export var getExecutingFilePath = sys.getExecutingFilePath;
2018
export var getCurrentDirectory = sys.getCurrentDirectory;
2119

2220
var args = sys.args;
2321

2422
// augment sys so first ts.executeCommandLine call will be finish silently
25-
sys.writeErr = (s: string) => { };
23+
sys.write = (s: string) => { };
2624
sys.args = []
2725

2826
export function restoreSys() {
2927
sys.args = args;
30-
sys.writeErr = writeErr;
28+
sys.write = write;
3129
}
3230

3331
export function hasLogIOFlag() {
@@ -96,11 +94,9 @@ module perftest {
9694
var err: string = "";
9795

9896
sys.write = (s: string) => { out += s; };
99-
sys.writeErr = (s: string) => { err += s; };
10097

10198
return {
10299
getOut: () => out,
103-
getErr: () => err
104100
};
105101
}
106102
}

tests/perftc.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@ if (perftest.hasLogIOFlag()) {
88
var compilerHost: ts.CompilerHost = {
99
getSourceFile: (s, v) => {
1010
var content = perftest.readFile(s);
11-
return content !== undefined ? ts.createSourceFile(s, content, v) : undefined;
11+
return content !== undefined ? ts.createSourceFile(s, content, v, ts.ByteOrderMark.Utf8) : undefined;
1212
},
1313
getDefaultLibFilename: () => ts.combinePaths(ts.getDirectoryPath(ts.normalizePath(perftest.getExecutingFilePath())), "lib.d.ts"),
1414
writeFile: (f: string, content: string) => { throw new Error("Unexpected operation: writeFile"); },
1515
getCurrentDirectory: () => perftest.getCurrentDirectory(),
16-
getCanonicalFileName: getCanonicalFileName,
17-
useCaseSensitiveFileNames: () => sys.useCaseSensitiveFileNames
16+
getCanonicalFileName: ts.getCanonicalFileName,
17+
useCaseSensitiveFileNames: () => sys.useCaseSensitiveFileNames,
18+
getNewLine: () => sys.newLine
1819
};
1920

2021
var commandLine = ts.parseCommandLine(perftest.getArgsWithoutLogIOFlag());
@@ -26,5 +27,4 @@ else {
2627
var io = perftest.prepare();
2728
ts.executeCommandLine(perftest.getArgsWithoutIOLogFile());
2829
perftest.write(io.getOut());
29-
perftest.writeErr(io.getErr());
3030
}

0 commit comments

Comments
 (0)