Merge pull request microsoft#3155 from Microsoft/useCRLFByDefaultInTest

yuit · yuit · commit 4b92e25b7624 · 2015-05-14T15:59:24.000-07:00
Use crlf by default in test
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
@@ -45,10 +45,12 @@ module Utils {
     export function getExecutionEnvironment() {
         if (typeof WScript !== "undefined" && typeof ActiveXObject === "function") {
             return ExecutionEnvironment.CScript;
-        } else if (typeof window !== "undefined") {
+        }
+        else if (typeof window !== "undefined") {
             return ExecutionEnvironment.Browser;
-        } else {
-            return ExecutionEnvironment.Node;
+        }
+        else {
+            return ExecutionEnvironment.Node;
         }
     }
 
@@ -945,6 +947,7 @@ module Harness {
                 options = options || { noResolve: false };
                 options.target = options.target || ts.ScriptTarget.ES3;
                 options.module = options.module || ts.ModuleKind.None;
+                options.newLine = options.newLine || ts.NewLineKind.CarriageReturnLineFeed;
                 options.noErrorTruncation = true;
 
                 if (settingsCallback) {
diff --git a/tests/baselines/reference/contextualTyping1.js b/tests/baselines/reference/contextualTyping1.js
@@ -2,4 +2,4 @@
 var foo: {id:number;} = {id:4};
 
 //// [contextualTyping1.js]
-var foo = { id: 4 };\n
+var foo = { id: 4 };
