language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-26 13:29:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

carriage return fixes for windows

Browse source
This commit is contained in:
Folkert 2022-10-30 11:38:43 +01:00
parent 69fe0464f5
commit 22e91e62c6
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/cli/tests/cli_run.rs
View file

@ -112,7 +112,7 @@ mod cli_run {
let stderr = compile_out.stderr.replacen(ignorable, "", 1); let stderr = compile_out.stderr.replacen(ignorable, "", 1);
// for some reason, llvm prints out this warning when targetting windows // for some reason, llvm prints out this warning when targetting windows
let ignorable = "warning: ignoring debug info with an invalid version (0) in app\n"; let ignorable = "warning: ignoring debug info with an invalid version (0) in app\r\n";
let stderr = stderr.replacen(ignorable, "", 1); let stderr = stderr.replacen(ignorable, "", 1);
let is_reporting_runtime = stderr.starts_with("runtime: ") && stderr.ends_with("ms\n"); let is_reporting_runtime = stderr.starts_with("runtime: ") && stderr.ends_with("ms\n");
@ -402,6 +402,11 @@ mod cli_run {
) )
} }
#[cfg(windows)]
const LINE_ENDING: &str = "\r\n";
#[cfg(not(windows))]
const LINE_ENDING: &str = "\n";
#[test] #[test]
// uses C platform // uses C platform
fn platform_switching_main() { fn platform_switching_main() {
@ -409,7 +414,7 @@ mod cli_run {
"examples/platform-switching", "examples/platform-switching",
"main.roc", "main.roc",
"rocLovesPlatforms", "rocLovesPlatforms",
"Which platform am I running on now?\n", &("Which platform am I running on now?".to_string() + LINE_ENDING),
true, true,
) )
} }