From 270ac90cc13cf446cdccd884e3b9e4de4aec5842 Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Sat, 23 Dec 2023 17:24:54 +0100 Subject: ls: set correct block size when -k is provided --- tests/by-util/test_ls.rs | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'tests/by-util/test_ls.rs') diff --git a/tests/by-util/test_ls.rs b/tests/by-util/test_ls.rs index a7744063f..5da8912e3 100644 --- a/tests/by-util/test_ls.rs +++ b/tests/by-util/test_ls.rs @@ -3890,6 +3890,56 @@ fn test_posixly_correct_and_block_size_env_vars() { .stdout_contains(" 1024 "); } +#[cfg(all(unix, feature = "dd"))] +#[test] +fn test_posixly_correct_and_block_size_env_vars_with_k() { + let scene = TestScenario::new(util_name!()); + + scene + .ccmd("dd") + .arg("if=/dev/zero") + .arg("of=file") + .arg("bs=1024") + .arg("count=1") + .succeeds(); + + scene + .ucmd() + .arg("-l") + .arg("-k") + .env("POSIXLY_CORRECT", "some_value") + .succeeds() + .stdout_contains_line("total 4") + .stdout_contains(" 1024 "); + + scene + .ucmd() + .arg("-l") + .arg("-k") + .env("LS_BLOCK_SIZE", "512") + .succeeds() + .stdout_contains_line("total 4") + .stdout_contains(" 2 "); + + scene + .ucmd() + .arg("-l") + .arg("-k") + .env("BLOCK_SIZE", "512") + .succeeds() + .stdout_contains_line("total 4") + .stdout_contains(" 2 "); + + scene + .ucmd() + .arg("-l") + .arg("-k") + .env("BLOCKSIZE", "512") + .succeeds() + .stdout_contains_line("total 4") + .stdout_contains(" 1024 "); +} + #[test] fn test_ls_invalid_block_size() { new_ucmd!() -- cgit v1.2.3