From 9ec396231eae982eb5f1ece81090452f45178caf Mon Sep 17 00:00:00 2001 From: aiongg Date: Wed, 18 Nov 2026 14:59:39 +0000 Subject: [PATCH] fix(text): skip the OS locale query in nextest test processes --- crates/text/src/cjk.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/crates/text/src/cjk.rs b/crates/text/src/cjk.rs index 104ba2aa93..6b1b20db11 100644 --- a/crates/text/src/cjk.rs +++ b/crates/text/src/cjk.rs @@ -116,7 +116,12 @@ fn detect_locale() -> Option { if let Some(v) = env("PHOTOCRAFT_LOCALE") { return Some(v); } - if let Some(v) = os_locale() { + // Test processes run by cargo-nextest (`NEXTEST` set) skip the OS query: each test is its own + // process, and on Windows the query starts a `reg.exe` child every time (#15377 did the same + // for the system font scan). They then see the same locale on every machine. + if std::env::var_os("NEXTEST").is_none() + && let Some(v) = os_locale() + { return Some(v); } ["LC_ALL", "LC_MESSAGES", "LANG", "LANGUAGE"].iter().find_map(|k| env(k)).map(|v| v.split(':').next().unwrap_or("").to_string())