diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
index c8f20746a07..ea6fe174eeb 100644
--- a/src/harness/fourslash.ts
+++ b/src/harness/fourslash.ts
@@ -343,7 +343,8 @@ module FourSlash {
if (!resolvedResult.isLibFile) {
this.languageServiceAdapterHost.addScript(Harness.Compiler.defaultLibFileName, Harness.Compiler.defaultLibSourceFile.text);
}
- } else {
+ }
+ else {
// resolveReference file-option is not specified then do not resolve any files and include all inputFiles
ts.forEachKey(this.inputFiles, fileName => {
if (!Harness.isLibraryFile(fileName)) {
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
index 70c5cae8c49..8934ab70943 100644
--- a/src/harness/harness.ts
+++ b/src/harness/harness.ts
@@ -97,7 +97,7 @@ module Utils {
}
try {
- var content = ts.sys.readFile(Harness.userSpecifiedroot + path);
+ var content = ts.sys.readFile(Harness.userSpecifiedRoot + path);
}
catch (err) {
return undefined;
@@ -720,7 +720,8 @@ module Harness {
}
// Settings
- export var userSpecifiedroot = "";
+ export let userSpecifiedRoot = "";
+ export let lightMode = false;
/** Functionality for compiling TypeScript code */
export module Compiler {
@@ -1610,9 +1611,9 @@ module Harness {
function baselinePath(fileName: string, type: string, baselineFolder: string, subfolder?: string) {
if (subfolder !== undefined) {
- return Harness.userSpecifiedroot + baselineFolder + '/' + subfolder + '/' + type + '/' + fileName;
+ return Harness.userSpecifiedRoot + baselineFolder + '/' + subfolder + '/' + type + '/' + fileName;
} else {
- return Harness.userSpecifiedroot + baselineFolder + '/' + type + '/' + fileName;
+ return Harness.userSpecifiedRoot + baselineFolder + '/' + type + '/' + fileName;
}
}
@@ -1728,7 +1729,7 @@ module Harness {
}
export function getDefaultLibraryFile(): { unitName: string, content: string } {
- var libFile = Harness.userSpecifiedroot + Harness.libFolder + "/" + "lib.d.ts";
+ var libFile = Harness.userSpecifiedRoot + Harness.libFolder + "/" + "lib.d.ts";
return {
unitName: libFile,
content: IO.readFile(libFile)
diff --git a/src/harness/runner.ts b/src/harness/runner.ts
index 4bcd5643efa..10992661052 100644
--- a/src/harness/runner.ts
+++ b/src/harness/runner.ts
@@ -18,6 +18,7 @@
///
///
///
+///
function runTests(runners: RunnerBase[]) {
for (var i = iterations; i > 0; i--) {
@@ -36,7 +37,6 @@ var testconfig = 'test.config';
var testConfigFile =
Harness.IO.fileExists(mytestconfig) ? Harness.IO.readFile(mytestconfig) :
(Harness.IO.fileExists(testconfig) ? Harness.IO.readFile(testconfig) : '');
-var lightMode: boolean;
if (testConfigFile !== '') {
// TODO: not sure why this is crashing mocha
@@ -44,7 +44,7 @@ if (testConfigFile !== '') {
//var testConfig = testConfigFile.match(/test:\s\['(.*)'\]/);
//var options = testConfig ? [testConfig[1]] : [];
if (testConfig.light) {
- lightMode = true;
+ Harness.lightMode = true;
}
if (testConfig.test && testConfig.test.length > 0) {
diff --git a/src/harness/runnerServer.ts b/src/harness/runnerServer.ts
new file mode 100644
index 00000000000..bc60e34910d
--- /dev/null
+++ b/src/harness/runnerServer.ts
@@ -0,0 +1,17 @@
+
+///
+
+import child_process = require("child_process");
+
+type RunnerTestSet = string[]
+
+let testSets: RunnerTestSet[];
+
+for (let testSet of testSets) {
+ let child = child_process.fork("blah!");
+ child.on("message", (data: ) => {
+
+ }
+}
+
+function populateRunnerTestSet
\ No newline at end of file
diff --git a/src/harness/runnerbase.ts b/src/harness/runnerbase.ts
index 49ca796448a..269e889704c 100644
--- a/src/harness/runnerbase.ts
+++ b/src/harness/runnerbase.ts
@@ -12,7 +12,7 @@ class RunnerBase {
}
public enumerateFiles(folder: string, regex?: RegExp, options?: { recursive: boolean }): string[] {
- return Harness.IO.listFiles(Harness.userSpecifiedroot + folder, regex, { recursive: (options ? options.recursive : false) });
+ return Harness.IO.listFiles(Harness.userSpecifiedRoot + folder, regex, { recursive: (options ? options.recursive : false) });
}
/** Setup the runner's tests so that they are ready to be executed by the harness