authorgravatar for hkupty@gmail.comHenry Kupty <hkupty@gmail.com> 2025-09-25 23:27:13+02:00
committergravatar for squeek502@hotmail.comRyan Liptak <squeek502@hotmail.com> 2025-10-03 16:29:08-07:00
log7bee39c1fdf19303f8c174727ce84ae787ad35bf
treef1a80d62e45eaca2608ff7b3d9d2fd45ddec307c
parenta26a654c55e0f3015e03b745b4c22b2bc90d3dc9

test: enter after check to preserve depth

1 files changed, 6 insertions(+), 5 deletions(-)

lib/std/fs/test.zig+6-5
...@@ -1851,10 +1851,6 @@ test "selective walker, skip entries that start with ." {...@@ -1851,10 +1851,6 @@ test "selective walker, skip entries that start with ." {
1851 var num_walked: usize = 0;1851 var num_walked: usize = 0;
1852 while (try walker.next()) |entry| {1852 while (try walker.next()) |entry| {
1853 if (entry.basename[0] == '.') continue;1853 if (entry.basename[0] == '.') continue;
1854 if (entry.kind == .directory) {
1855 try walker.enter(entry);
1856 }
1857
1858 testing.expect(expected_basenames.has(entry.basename)) catch |err| {1854 testing.expect(expected_basenames.has(entry.basename)) catch |err| {
1859 std.debug.print("found unexpected basename: {f}\n", .{std.ascii.hexEscape(entry.basename, .lower)});1855 std.debug.print("found unexpected basename: {f}\n", .{std.ascii.hexEscape(entry.basename, .lower)});
1860 return err;1856 return err;
...@@ -1865,9 +1861,14 @@ test "selective walker, skip entries that start with ." {...@@ -1865,9 +1861,14 @@ test "selective walker, skip entries that start with ." {
1865 };1861 };
18661862
1867 testing.expectEqual(expected_paths.get(entry.path).?, walker.depth()) catch |err| {1863 testing.expectEqual(expected_paths.get(entry.path).?, walker.depth()) catch |err| {
1868 std.debug.print("path reported unexpected depth: {f}, {d}", .{ std.ascii.hexEscape(entry.path, .lower), walker.depth() });1864 std.debug.print("path reported unexpected depth: {f}, {d}, expected {d}\n", .{ std.ascii.hexEscape(entry.path, .lower), walker.depth(), expected_paths.get(entry.path).? });
1869 return err;1865 return err;
1870 };1866 };
1867
1868 if (entry.kind == .directory) {
1869 try walker.enter(entry);
1870 }
1871
1871 // make sure that the entry.dir is the containing dir1872 // make sure that the entry.dir is the containing dir
1872 var entry_dir = try entry.dir.openDir(entry.basename, .{});1873 var entry_dir = try entry.dir.openDir(entry.basename, .{});
1873 defer entry_dir.close();1874 defer entry_dir.close();