From 94972d45c7aa0532c3b44d2c131b4028b63f5555 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 12 Oct 2023 23:07:27 +0200 Subject: [PATCH] ls: Document a bit tests/ls/stat-dtype.sh --- src/uu/ls/src/ls.rs | 8 ++++---- tests/by-util/test_ls.rs | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/uu/ls/src/ls.rs b/src/uu/ls/src/ls.rs index 39bab7982..8a05e81f8 100644 --- a/src/uu/ls/src/ls.rs +++ b/src/uu/ls/src/ls.rs @@ -2395,10 +2395,10 @@ fn display_grid( writeln!(out)?; } } else { - let mut grid = Grid::new(GridOptions { - filling: Filling::Spaces(2), - direction, - }); + // To match gnu/tests/ls/stat-dtype.sh + // we might want to have Text("\t".to_string()); + let filling = Filling::Spaces(2); + let mut grid = Grid::new(GridOptions { filling, direction }); for name in names { grid.add(name); diff --git a/tests/by-util/test_ls.rs b/tests/by-util/test_ls.rs index 7d0f86298..d9c1c8740 100644 --- a/tests/by-util/test_ls.rs +++ b/tests/by-util/test_ls.rs @@ -3678,3 +3678,17 @@ fn test_ls_dired_complex() { println!("Extracted filenames: {:?}", filenames); assert_eq!(filenames, vec!["a1", "a22", "a333", "a4444", "d"]); } + +#[ignore = "issue #5396"] +#[test] +fn test_ls_tabsize_cf() { + let (at, mut ucmd) = at_and_ucmd!(); + + at.mkdir("e"); + at.mkdir("e/a2345"); + at.mkdir("e/b"); + + ucmd.args(&["-CF", "e"]) + .succeeds() + .stdout_is("a2345/\tb/\n"); +}