Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 21:33:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use setlocale() in the test_convert test

Browse source 
This "fixes" (or at least hides) the intermittent test_convert failures,
as we no longer race with other setlocale calls.
This commit is contained in:
ridiculousfish 2023-07-08 11:22:24 -07:00
parent a99fa201b6
commit 98d88e06ff
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
fish-rust/src/tests/string_escape.rs
View file

@ -6,15 +6,21 @@ use crate::wchar::{widestrs, wstr, WString};
use crate::wutil::encoding::{wcrtomb, zero_mbstate, AT_LEAST_MB_LEN_MAX};
use rand::{Rng, RngCore};
use rand_pcg::Pcg64Mcg;
use std::sync::Mutex;
/// wcs2string is locale-dependent, so ensure we have a multibyte locale
/// before using it in a test.
/// This is only needed for the variable escape function.
fn setlocale() {
static LOCALE_LOCK: Mutex<()> = Mutex::new(());
let _guard = LOCALE_LOCK.lock().unwrap();
#[rustfmt::skip]
const UTF8_LOCALES: &[&str] = &[
"C.UTF-8", "en_US.UTF-8", "en_GB.UTF-8", "de_DE.UTF-8", "C.utf8", "UTF-8",
];
if crate::compat::MB_CUR_MAX() > 1 {
return;
}
for locale in UTF8_LOCALES {
let locale = std::ffi::CString::new(locale.to_owned()).unwrap();
unsafe { libc::setlocale(libc::LC_CTYPE, locale.as_ptr()) };
@ -172,6 +178,7 @@ fn str2hex(input: &[u8]) -> String {
/// string comes back through double conversion.
#[test]
fn test_convert() {
setlocale();
use rand::random;
let seed: u128 = random::<u128>();