Skip to content

Commit c03c580

Browse files
committed
test: fix replacing .exe only once
On non-Windows platform the redacted string became something like below, which was valid but didn't make sense: ``` [EXE]/[EXE]U[EXE]s[EXE]e[EXE]r[EXE]s[EXE]/[EXE]w[EXE]h[EXE]l[EXE]o[EXE]/[EXE]d[EXE]e[EXE]v[EXE]/[EXE]r[EXE]u[EXE]s[EXE]t[EXE]/[EXE]b[EXE]u[EXE]i[EXE]l[EXE]d[EXE]/[EXE]a[EXE]a[EXE]r[EXE]c[EXE]h[EXE]6[EXE]4[EXE]-[EXE]a[EXE]p[EXE]p[EXE]l[EXE]e[EXE]-[EXE]d[EXE]a[EXE]r[EXE]w[EXE]i[EXE]n[EXE]/[EXE]s[EXE]t[EXE]a[EXE]g[EXE]e[EXE]2[EXE]-[EXE]t[EXE]o[EXE]o[EXE]l[EXE]s[EXE]/[EXE]a[EXE]a[EXE]r[EXE]c[EXE]h[EXE]6[EXE]4[EXE]-[EXE]a[EXE]p[EXE]p[EXE]l[EXE]e[EXE]-[EXE]d[EXE]a[EXE]r[EXE]w[EXE]i[EXE]n[EXE]/[EXE]r[EXE]e[EXE]l[EXE]e[EXE]a[EXE]s[EXE]e[EXE]/[EXE]c[EXE]a[EXE]r[EXE]g[EXE]o[EXE] ``` Here we simply remove the extension and append `[EXE]` at the end.
1 parent d8cb5fb commit c03c580

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

tests/testsuite/test.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3888,12 +3888,15 @@ fn cargo_test_env() {
38883888
.file("src/lib.rs", &src)
38893889
.build();
38903890

3891-
let cargo = cargo_exe()
3892-
.canonicalize()
3893-
.unwrap()
3894-
.to_str()
3895-
.unwrap()
3896-
.replace(std::env::consts::EXE_SUFFIX, "[EXE]");
3891+
let cargo = format!(
3892+
"{}[EXE]",
3893+
cargo_exe()
3894+
.canonicalize()
3895+
.unwrap()
3896+
.with_extension("")
3897+
.to_str()
3898+
.unwrap()
3899+
);
38973900
p.cargo("test --lib -- --nocapture")
38983901
.with_stderr_contains(cargo)
38993902
.with_stdout_data(str![[r#"
@@ -3908,10 +3911,7 @@ test env_test ... ok
39083911
.unwrap()
39093912
.canonicalize()
39103913
.unwrap();
3911-
let stderr_rustc = rustc
3912-
.to_str()
3913-
.unwrap()
3914-
.replace(std::env::consts::EXE_SUFFIX, "[EXE]");
3914+
let stderr_rustc = format!("{}[EXE]", rustc.with_extension("").to_str().unwrap());
39153915
p.cargo("test --lib -- --nocapture")
39163916
// we use rustc since $CARGO is only used if it points to a path that exists
39173917
.env(cargo::CARGO_ENV, rustc)

0 commit comments

Comments
 (0)