diff --git a/src/harness/compilerRunner.ts b/src/harness/compilerRunner.ts
index 293b88c65ef..21e88b9e41a 100644
--- a/src/harness/compilerRunner.ts
+++ b/src/harness/compilerRunner.ts
@@ -1,7 +1,6 @@
///
///
///
-///
const enum CompilerTestType {
Conformance,
@@ -194,8 +193,6 @@ class CompilerBaselineRunner extends RunnerBase {
jsCode += '//// [' + Harness.Path.getFileName(result.files[i].fileName) + ']\r\n';
jsCode += getByteOrderMarkText(result.files[i]);
jsCode += result.files[i].code;
- // Re-enable this if we want to do another comparison of old vs new compiler baselines
- // jsCode += SyntacticCleaner.clean(result.files[i].code);
}
if (result.declFilesCode.length > 0) {
diff --git a/src/harness/exec.ts b/src/harness/exec.ts
deleted file mode 100644
index 6ed538b1d40..00000000000
--- a/src/harness/exec.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Copyright (c) Microsoft Corporation. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-// Allows for executing a program with command-line arguments and reading the result
-interface IExec {
- exec: (fileName: string, cmdLineArgs: string[], handleResult: (ExecResult: ExecResult) => void) => void;
-}
-
-class ExecResult {
- public stdout = "";
- public stderr = "";
- public exitCode: number;
-}
-
-class WindowsScriptHostExec implements IExec {
- public exec(fileName: string, cmdLineArgs: string[], handleResult: (ExecResult: ExecResult) => void) : void {
- var result = new ExecResult();
- var shell = new ActiveXObject('WScript.Shell');
- try {
- var process = shell.Exec(fileName + ' ' + cmdLineArgs.join(' '));
- } catch(e) {
- result.stderr = e.message;
- result.exitCode = 1;
- handleResult(result);
- return;
- }
- // Wait for it to finish running
- while (process.Status != 0) { /* todo: sleep? */ }
-
-
- result.exitCode = process.ExitCode;
- if(!process.StdOut.AtEndOfStream) result.stdout = process.StdOut.ReadAll();
- if(!process.StdErr.AtEndOfStream) result.stderr = process.StdErr.ReadAll();
-
- handleResult(result);
- }
-}
-
-class NodeExec implements IExec {
- public exec(fileName: string, cmdLineArgs: string[], handleResult: (ExecResult: ExecResult) => void) : void {
- var nodeExec = require('child_process').exec;
-
- var result = new ExecResult();
- result.exitCode = null;
- var cmdLine = fileName + ' ' + cmdLineArgs.join(' ');
- var process = nodeExec(cmdLine, function(error: any, stdout: string, stderr: string) {
- result.stdout = stdout;
- result.stderr = stderr;
- result.exitCode = error ? error.code : 0;
- handleResult(result);
- });
- }
-}
-
-var Exec: IExec = function() : IExec {
- var global = Function("return this;").call(null);
- if(typeof global.ActiveXObject !== "undefined") {
- return new WindowsScriptHostExec();
- } else {
- return new NodeExec();
- }
-}();
\ No newline at end of file
diff --git a/src/harness/project.ts b/src/harness/project.ts
deleted file mode 100644
index d94cbd576d5..00000000000
--- a/src/harness/project.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// Copyright (c) Microsoft Corporation. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-///
-///
-///
-///
diff --git a/src/harness/rwcRunner.ts b/src/harness/rwcRunner.ts
index 0d56fa7250e..76331b8dc7d 100644
--- a/src/harness/rwcRunner.ts
+++ b/src/harness/rwcRunner.ts
@@ -1,6 +1,5 @@
///
///
-///
///
///
@@ -132,7 +131,7 @@ module RWC {
it('has the expected emitted code', () => {
Harness.Baseline.runBaseline('has the expected emitted code', baseName + '.output.js', () => {
- return Harness.Compiler.collateOutputs(compilerResult.files, s => SyntacticCleaner.clean(s));
+ return Harness.Compiler.collateOutputs(compilerResult.files);
}, false, baselineOpts);
});
diff --git a/src/harness/syntacticCleaner.ts b/src/harness/syntacticCleaner.ts
deleted file mode 100644
index 05b42951246..00000000000
--- a/src/harness/syntacticCleaner.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-// Use this to get emitter-agnostic baselines
-
-class SyntacticCleaner {
- static clean(sourceFileContents: string) {
- return sourceFileContents;
- }
-}
-
-/* TODO: Re-implement or maybe delete
-class SyntacticCleaner extends TypeScript.SyntaxWalker {
- private emit: string[] = [];
-
- public visitToken(token: TypeScript.ISyntaxToken): void {
- this.emit.push(token.text());
- if (token.kind() === TypeScript.SyntaxKind.SemicolonToken) {
- this.emit.push('\r\n');
- } else {
- this.emit.push(' ');
-
- }
- }
-
- static clean(sourceFileContents: string): string {
- var parsed = TypeScript.Parser.parse('_emitted.ts', TypeScript.SimpleText.fromString(sourceFileContents), TypeScript.LanguageVersion.EcmaScript5, false);
- var cleaner = new SyntacticCleaner();
- cleaner.visitSourceUnit(parsed.sourceUnit());
- return cleaner.emit.join('');
- }
-}
-*/
diff --git a/src/harness/test262Runner.ts b/src/harness/test262Runner.ts
index 0091da5e911..5f8250c5e23 100644
--- a/src/harness/test262Runner.ts
+++ b/src/harness/test262Runner.ts
@@ -1,6 +1,5 @@
///
///
-///
class Test262BaselineRunner extends RunnerBase {
private static basePath = 'internal/cases/test262';
@@ -65,7 +64,7 @@ class Test262BaselineRunner extends RunnerBase {
it('has the expected emitted code', () => {
Harness.Baseline.runBaseline('has the expected emitted code', testState.filename + '.output.js', () => {
var files = testState.compilerResult.files.filter(f=> f.fileName !== Test262BaselineRunner.helpersFilePath);
- return Harness.Compiler.collateOutputs(files, s => SyntacticCleaner.clean(s));
+ return Harness.Compiler.collateOutputs(files);
}, false, Test262BaselineRunner.baselineOptions);
});