Moved 'lightMode' flag to Harness.

DanielRosenwasser · DanielRosenwasser · commit a27de3f7d898 · 2015-05-01T17:08:48.000-07:00
diff --git 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
@@ -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
@@ -18,6 +18,7 @@
 /// <reference path='fourslashRunner.ts' />
 /// <reference path='projectsRunner.ts' />
 /// <reference path='rwcRunner.ts' />
+/// <reference path='harness.ts' />
 
 function runTests(runners: RunnerBase[]) {
     for (var i = iterations; i > 0; i--) {
@@ -36,15 +37,14 @@ 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
     var testConfig = JSON.parse(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
@@ -0,0 +1,17 @@
+﻿
+/// <reference path='..\server\node.d.ts' />
+
+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
diff --git 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 

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ module Utils {`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`try {`
`100`		`- var content = ts.sys.readFile(Harness.userSpecifiedroot + path);`
	`100`	`+ var content = ts.sys.readFile(Harness.userSpecifiedRoot + path);`
`101`	`101`	`}`
`102`	`102`	`catch (err) {`
`103`	`103`	`return undefined;`
`@@ -720,7 +720,8 @@ module Harness {`
`720`	`720`	`}`
`721`	`721`
`722`	`722`	`// Settings`
`723`		`- export var userSpecifiedroot = "";`
	`723`	`+ export let userSpecifiedRoot = "";`
	`724`	`+ export let lightMode = false;`
`724`	`725`
`725`	`726`	`/** Functionality for compiling TypeScript code */`
`726`	`727`	`export module Compiler {`
`@@ -1610,9 +1611,9 @@ module Harness {`
`1610`	`1611`
`1611`	`1612`	`function baselinePath(fileName: string, type: string, baselineFolder: string, subfolder?: string) {`
`1612`	`1613`	`if (subfolder !== undefined) {`
`1613`		`- return Harness.userSpecifiedroot + baselineFolder + '/' + subfolder + '/' + type + '/' + fileName;`
	`1614`	`+ return Harness.userSpecifiedRoot + baselineFolder + '/' + subfolder + '/' + type + '/' + fileName;`
`1614`	`1615`	`} else {`
`1615`		`- return Harness.userSpecifiedroot + baselineFolder + '/' + type + '/' + fileName;`
	`1616`	`+ return Harness.userSpecifiedRoot + baselineFolder + '/' + type + '/' + fileName;`
`1616`	`1617`	`}`
`1617`	`1618`	`}`
`1618`	`1619`
`@@ -1728,7 +1729,7 @@ module Harness {`
`1728`	`1729`	`}`
`1729`	`1730`
`1730`	`1731`	`export function getDefaultLibraryFile(): { unitName: string, content: string } {`
`1731`		`- var libFile = Harness.userSpecifiedroot + Harness.libFolder + "/" + "lib.d.ts";`
	`1732`	`+ var libFile = Harness.userSpecifiedRoot + Harness.libFolder + "/" + "lib.d.ts";`
`1732`	`1733`	`return {`
`1733`	`1734`	`unitName: libFile,`
`1734`	`1735`	`content: IO.readFile(libFile)`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class RunnerBase {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`public enumerateFiles(folder: string, regex?: RegExp, options?: { recursive: boolean }): string[] {`
`15`		`- return Harness.IO.listFiles(Harness.userSpecifiedroot + folder, regex, { recursive: (options ? options.recursive : false) });`
	`15`	`+ return Harness.IO.listFiles(Harness.userSpecifiedRoot + folder, regex, { recursive: (options ? options.recursive : false) });`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`/** Setup the runner's tests so that they are ready to be executed by the harness`