Skip to content

Use crlf by default in test #3155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yuit merged 4 commits into from
May 14, 2015
Merged

Use crlf by default in test #3155

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3bd96e3
use CRLF by default
May 13, 2015
386f9f2
Update baseline
May 13, 2015
afc0847
Address code review
May 14, 2015
af3d67d
Merge branch 'master' into useCRLFByDefaultInTest
May 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
use CRLF by default
  • Loading branch information
Yui T committed May 13, 2015
commit 3bd96e328a6981db9e0c3a407e5f1a602b0091cb
7 changes: 4 additions & 3 deletions src/harness/harness.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ 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") {
Copy link
Copy Markdown
Contributor

@CyrusNajmabadi CyrusNajmabadi May 14, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

newlines after }

return ExecutionEnvironment.Browser;
} else {
return ExecutionEnvironment.Node;
} else {
return ExecutionEnvironment.Node;
}
}

Expand Down Expand Up @@ -945,6 +945,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) {
Expand Down