Skip to content

Commit

Permalink
Rollup merge of rust-lang#129363 - Urgau:run-make-lc_all-c, r=jieyouxu
Browse files Browse the repository at this point in the history
Force `LC_ALL=C` for all run-make tests

This PR adds `LC_ALL=C` for all run-make tests so that they become locale independent.

Fixes rust-lang#129362
r? `@jieyouxu`
  • Loading branch information
matthiaskrgr authored Aug 21, 2024
2 parents cdec9a0 + b6909ce commit 92f0b7e
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/tools/run-make-support/src/run.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ fn run_common(name: &str, args: Option<&[&str]>) -> Command {
}
env::join_paths(paths.iter()).unwrap()
});
cmd.env("LC_ALL", "C"); // force english locale

if is_windows() {
let mut paths = vec![];
Expand Down Expand Up @@ -84,5 +85,6 @@ pub fn run_fail(name: &str) -> CompletedProcess {
pub fn cmd<S: AsRef<OsStr>>(program: S) -> Command {
let mut command = Command::new(program);
set_host_rpath(&mut command);
command.env("LC_ALL", "C"); // force english locale
command
}

0 comments on commit 92f0b7e

Please sign in to comment.