Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-11-15 09:27:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

apply different reference sizes for f2fs (android) case

Browse source
This commit is contained in:
Ulrich Hornung 2024-03-14 20:02:55 +01:00
parent f3bbf53412
commit 066032b1d3
No known key found for this signature in database
GPG key ID: 64EA3BAAF1BC0603
1 changed files with 43 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
tests/by-util/test_ls.rs
View file

@ -73,6 +73,21 @@ fn test_ls_ordering() {
.stdout_matches(&Regex::new("some-dir1:\\ntotal 0").unwrap()); .stdout_matches(&Regex::new("some-dir1:\\ntotal 0").unwrap());
} }
#[cfg(all(unix, feature = "df", not(target_os = "freebsd")))]
fn get_filesystem_type(scene: &TestScenario, path: &Path) -> String {
let mut cmd = scene.ccmd("df");
cmd.args(&["-PT"]).arg(path);
let output = cmd.succeeds();
let stdout_str = String::from_utf8_lossy(output.stdout());
println!("output of stat call ({:?}):\n{}", cmd, stdout_str);
let regex_str = r#"Filesystem\s+Type\s+.+[\r\n]+([^\s]+)\s+(?<fstype>[^\s]+)\s+"#;
let regex = Regex::new(regex_str).unwrap();
let m = regex.captures(&stdout_str).unwrap();
let fstype = m["fstype"].to_owned();
println!("detected fstype: {}", fstype);
fstype
}
#[cfg(all(feature = "truncate", feature = "dd"))] #[cfg(all(feature = "truncate", feature = "dd"))]
#[test] // FIXME: fix this test for FreeBSD #[test] // FIXME: fix this test for FreeBSD
fn test_ls_allocation_size() { fn test_ls_allocation_size() {
@ -81,7 +96,7 @@ fn test_ls_allocation_size() {
at.mkdir("some-dir1"); at.mkdir("some-dir1");
at.touch("some-dir1/empty-file"); at.touch("some-dir1/empty-file");
#[cfg(unix)] #[cfg(all(unix, feature = "df"))]
{ {
scene scene
.ccmd("truncate") .ccmd("truncate")
@ -115,13 +130,24 @@ fn test_ls_allocation_size() {
.succeeds() .succeeds()
.stdout_matches(&Regex::new("[^ ] 2 [^ ]").unwrap()); .stdout_matches(&Regex::new("[^ ] 2 [^ ]").unwrap());
#[cfg(not(target_os = "freebsd"))]
let (zero_file_size_4k, zero_file_size_1k, zero_file_size_8k, zero_file_size_4m) =
match get_filesystem_type(&scene, &scene.fixtures.subdir).as_str() {
// apparently f2fs (flash friendly fs) accepts small overhead for better performance
"f2fs" => (4100, 1025, 8200, "4.1M"),
_ => (4096, 1024, 8192, "4.0M"),
};
#[cfg(not(target_os = "freebsd"))] #[cfg(not(target_os = "freebsd"))]
scene scene
.ucmd() .ucmd()
.arg("-s1") .arg("-s1")
.arg("some-dir1") .arg("some-dir1")
.succeeds() .succeeds()
.stdout_is("total 4096\n 0 empty-file\n 0 file-with-holes\n4096 zero-file\n"); .stdout_is(format!(
"total {zero_file_size_4k}\n 0 empty-file\n 0 file-with-holes\n\
{zero_file_size_4k} zero-file\n"
));
scene scene
.ucmd() .ucmd()
@ -138,7 +164,7 @@ fn test_ls_allocation_size() {
.arg("some-dir1") .arg("some-dir1")
.succeeds() .succeeds()
.stdout_contains("0 empty-file") .stdout_contains("0 empty-file")
.stdout_contains("4096 zero-file"); .stdout_contains(format!("{zero_file_size_4k} zero-file"));
// Test alignment of different block sized files // Test alignment of different block sized files
let res = scene.ucmd().arg("-si1").arg("some-dir1").succeeds(); let res = scene.ucmd().arg("-si1").arg("some-dir1").succeeds();
@ -185,10 +211,10 @@ fn test_ls_allocation_size() {
.arg("-s1") .arg("-s1")
.arg("some-dir1") .arg("some-dir1")
.succeeds() .succeeds()
.stdout_contains("total 1024") .stdout_contains(format!("total {zero_file_size_1k}"))
.stdout_contains("0 empty-file") .stdout_contains("0 empty-file")
.stdout_contains("0 file-with-holes") .stdout_contains("0 file-with-holes")
.stdout_contains("1024 zero-file"); .stdout_contains(format!("{zero_file_size_1k} zero-file"));
#[cfg(not(target_os = "freebsd"))] #[cfg(not(target_os = "freebsd"))]
scene scene
@ -210,10 +236,10 @@ fn test_ls_allocation_size() {
.arg("-s1") .arg("-s1")
.arg("some-dir1") .arg("some-dir1")
.succeeds() .succeeds()
.stdout_contains("total 1024") .stdout_contains(format!("total {zero_file_size_1k}"))
.stdout_contains("0 empty-file") .stdout_contains("0 empty-file")
.stdout_contains("0 file-with-holes") .stdout_contains("0 file-with-holes")
.stdout_contains("1024 zero-file"); .stdout_contains(format!("{zero_file_size_1k} zero-file"));
#[cfg(not(target_os = "freebsd"))] #[cfg(not(target_os = "freebsd"))]
scene scene
@ -222,10 +248,10 @@ fn test_ls_allocation_size() {
.arg("-s1") .arg("-s1")
.arg("some-dir1") .arg("some-dir1")
.succeeds() .succeeds()
.stdout_contains("total 8192") .stdout_contains(format!("total {zero_file_size_8k}"))
.stdout_contains("0 empty-file") .stdout_contains("0 empty-file")
.stdout_contains("0 file-with-holes") .stdout_contains("0 file-with-holes")
.stdout_contains("8192 zero-file"); .stdout_contains(format!("{zero_file_size_8k} zero-file"));
// -k should make 'ls' ignore the env var // -k should make 'ls' ignore the env var
#[cfg(not(target_os = "freebsd"))] #[cfg(not(target_os = "freebsd"))]
@ -235,10 +261,10 @@ fn test_ls_allocation_size() {
.arg("-s1k") .arg("-s1k")
.arg("some-dir1") .arg("some-dir1")
.succeeds() .succeeds()
.stdout_contains("total 4096") .stdout_contains(format!("total {zero_file_size_4k}"))
.stdout_contains("0 empty-file") .stdout_contains("0 empty-file")
.stdout_contains("0 file-with-holes") .stdout_contains("0 file-with-holes")
.stdout_contains("4096 zero-file"); .stdout_contains(format!("{zero_file_size_4k} zero-file"));
// but manually specified blocksize overrides -k // but manually specified blocksize overrides -k
#[cfg(not(target_os = "freebsd"))] #[cfg(not(target_os = "freebsd"))]
@ -248,10 +274,10 @@ fn test_ls_allocation_size() {
.arg("--block-size=4K") .arg("--block-size=4K")
.arg("some-dir1") .arg("some-dir1")
.succeeds() .succeeds()
.stdout_contains("total 1024") .stdout_contains(format!("total {zero_file_size_1k}"))
.stdout_contains("0 empty-file") .stdout_contains("0 empty-file")
.stdout_contains("0 file-with-holes") .stdout_contains("0 file-with-holes")
.stdout_contains("1024 zero-file"); .stdout_contains(format!("{zero_file_size_1k} zero-file"));
#[cfg(not(target_os = "freebsd"))] #[cfg(not(target_os = "freebsd"))]
scene scene
@ -260,10 +286,10 @@ fn test_ls_allocation_size() {
.arg("--block-size=4K") .arg("--block-size=4K")
.arg("some-dir1") .arg("some-dir1")
.succeeds() .succeeds()
.stdout_contains("total 1024") .stdout_contains(format!("total {zero_file_size_1k}"))
.stdout_contains("0 empty-file") .stdout_contains("0 empty-file")
.stdout_contains("0 file-with-holes") .stdout_contains("0 file-with-holes")
.stdout_contains("1024 zero-file"); .stdout_contains(format!("{zero_file_size_1k} zero-file"));
// si option should always trump the human-readable option // si option should always trump the human-readable option
#[cfg(not(target_os = "freebsd"))] #[cfg(not(target_os = "freebsd"))]
@ -285,10 +311,10 @@ fn test_ls_allocation_size() {
.arg("--block-size=human-readable") .arg("--block-size=human-readable")
.arg("some-dir1") .arg("some-dir1")
.succeeds() .succeeds()
.stdout_contains("total 4.0M") .stdout_contains(format!("total {zero_file_size_4m}"))
.stdout_contains("0 empty-file") .stdout_contains("0 empty-file")
.stdout_contains("0 file-with-holes") .stdout_contains("0 file-with-holes")
.stdout_contains("4.0M zero-file"); .stdout_contains(format!("{zero_file_size_4m} zero-file"));
#[cfg(not(target_os = "freebsd"))] #[cfg(not(target_os = "freebsd"))]
scene scene