github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-25 09:39:52 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

printf/tests: Use c_char instead of i8

Browse Source 
Breaks on arm again
This commit is contained in:
Fabian Boehm 2024-05-27 12:46:07 +02:00
parent 8880fa8dd7
commit 7850142bef
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
printf/src/tests.rs
View File

@ -1,6 +1,7 @@
use crate::arg::ToArg; use crate::arg::ToArg;
use crate::locale::{Locale, C_LOCALE, EN_US_LOCALE}; use crate::locale::{Locale, C_LOCALE, EN_US_LOCALE};
use crate::{sprintf_locale, Error}; use crate::{sprintf_locale, Error};
use libc::c_char;
use std::f64::consts::{E, PI, TAU}; use std::f64::consts::{E, PI, TAU};
use std::fmt; use std::fmt;
use widestring::{utf32str, Utf32Str}; use widestring::{utf32str, Utf32Str};
@ -742,10 +743,10 @@ fn test_float_hex_prec() {
// while libc may not; as a result we may differ in the last digit. So this // while libc may not; as a result we may differ in the last digit. So this
// requires manual comparison. // requires manual comparison.
let mut c_storage = [0u8; 256]; let mut c_storage = [0u8; 256];
let c_storage_ptr = c_storage.as_mut_ptr() as *mut i8; let c_storage_ptr = c_storage.as_mut_ptr() as *mut c_char;
let mut rust_str = String::with_capacity(256); let mut rust_str = String::with_capacity(256);
let c_fmt = b"%.*a\0".as_ptr() as *const i8; let c_fmt = b"%.*a\0".as_ptr() as *const c_char;
let mut failed = false; let mut failed = false;
for sign in [1.0, -1.0].into_iter() { for sign in [1.0, -1.0].into_iter() {
for mut v in [0.0, 0.5, 1.0, 1.5, PI, TAU, E].into_iter() { for mut v in [0.0, 0.5, 1.0, 1.5, PI, TAU, E].into_iter() {
@ -775,14 +776,14 @@ fn test_float_hex_prec() {
assert!(!failed); assert!(!failed);
} }
fn test_exhaustive(rust_fmt: &Utf32Str, c_fmt: *const i8) { fn test_exhaustive(rust_fmt: &Utf32Str, c_fmt: *const c_char) {
// "There's only 4 billion floats so test them all." // "There's only 4 billion floats so test them all."
// This tests a format string expected to be of the form "%.*g" or "%.*e". // This tests a format string expected to be of the form "%.*g" or "%.*e".
// That is, it takes a precision and a double. // That is, it takes a precision and a double.
println!("Testing {}", rust_fmt); println!("Testing {}", rust_fmt);
let mut rust_str = String::with_capacity(128); let mut rust_str = String::with_capacity(128);
let mut c_storage = [0u8; 128]; let mut c_storage = [0u8; 128];
let c_storage_ptr = c_storage.as_mut_ptr() as *mut i8; let c_storage_ptr = c_storage.as_mut_ptr() as *mut c_char;
for i in 0..=u32::MAX { for i in 0..=u32::MAX {
if i % 1000000 == 0 { if i % 1000000 == 0 {
@ -820,7 +821,7 @@ fn test_float_g_exhaustive() {
// To run: cargo test test_float_g_exhaustive --release -- --ignored --nocapture // To run: cargo test test_float_g_exhaustive --release -- --ignored --nocapture
test_exhaustive( test_exhaustive(
widestring::utf32str!("%.*g"), widestring::utf32str!("%.*g"),
b"%.*g\0".as_ptr() as *const i8, b"%.*g\0".as_ptr() as *const c_char,
); );
} }
@ -830,7 +831,7 @@ fn test_float_e_exhaustive() {
// To run: cargo test test_float_e_exhaustive --release -- --ignored --nocapture // To run: cargo test test_float_e_exhaustive --release -- --ignored --nocapture
test_exhaustive( test_exhaustive(
widestring::utf32str!("%.*e"), widestring::utf32str!("%.*e"),
b"%.*e\0".as_ptr() as *const i8, b"%.*e\0".as_ptr() as *const c_char,
); );
} }
@ -840,6 +841,6 @@ fn test_float_f_exhaustive() {
// To run: cargo test test_float_f_exhaustive --release -- --ignored --nocapture // To run: cargo test test_float_f_exhaustive --release -- --ignored --nocapture
test_exhaustive( test_exhaustive(
widestring::utf32str!("%.*f"), widestring::utf32str!("%.*f"),
b"%.*f\0".as_ptr() as *const i8, b"%.*f\0".as_ptr() as *const c_char,
); );
} }