diff options
| author | Tavian Barnes <tavianator@tavianator.com> | 2022-03-13 13:32:44 -0400 |
|---|---|---|
| committer | Tavian Barnes <tavianator@tavianator.com> | 2022-03-13 13:44:32 -0400 |
| commit | 851942e235fe17869d7e7f2b3cc4d559f1e90e89 (patch) | |
| tree | fae14d24f9be3ec20d1b668ac9eed05d3438a153 | |
| parent | fa767895d4165dc9b0a8808f4760141067e0ea12 (diff) | |
tests: Use plain sort, not bfs_sort
bfs_sort existed to keep the test outputs nicely in breadth-first order.
Unfortunately the implementation using awk didn't support NUL bytes.
113 files changed, 533 insertions, 548 deletions
@@ -1069,10 +1069,6 @@ function make_scratch() { } make_scratch "$TMP/scratch" -function bfs_sort() { - awk -F/ '{ print NF - 1 " " $0 }' | sort -n | cut -d' ' -f2- -} - # Close stdin so bfs doesn't think we're interactive exec </dev/null @@ -1174,7 +1170,7 @@ function bfs_diff() ( local ACTUAL="$TMP/$CALLER.out" fi - $BFS "$@" | bfs_sort >"$ACTUAL" + $BFS "$@" | sort >"$ACTUAL" local STATUS="${PIPESTATUS[0]}" if [ ! "$UPDATE" ]; then @@ -2395,18 +2391,7 @@ function test_printf_leak() { function test_printf_nul() { # NUL byte regression test - local EXPECTED="$TESTS/${FUNCNAME[0]}.out" - if [ "$UPDATE" ]; then - local ACTUAL="$EXPECTED" - else - local ACTUAL="$TMP/${FUNCNAME[0]}.out" - fi - - invoke_bfs basic -maxdepth 0 -printf '%h\0%f\n' >"$ACTUAL" - - if [ ! "$UPDATE" ]; then - $DIFF -u "$EXPECTED" "$ACTUAL" - fi + bfs_diff basic -maxdepth 0 -printf '%h\0%f\n' } function test_printf_w() { diff --git a/tests/test_D_all.out b/tests/test_D_all.out index bb3cd8d..a7ccfe4 100644 --- a/tests/test_D_all.out +++ b/tests/test_D_all.out @@ -2,18 +2,18 @@ basic basic/a basic/b basic/c +basic/c/d basic/e +basic/e/f basic/g +basic/g/h basic/i basic/j -basic/k -basic/l -basic/c/d -basic/e/f -basic/g/h basic/j/foo +basic/k basic/k/foo -basic/l/foo basic/k/foo/bar +basic/l +basic/l/foo basic/l/foo/bar basic/l/foo/bar/baz diff --git a/tests/test_D_multi.out b/tests/test_D_multi.out index bb3cd8d..a7ccfe4 100644 --- a/tests/test_D_multi.out +++ b/tests/test_D_multi.out @@ -2,18 +2,18 @@ basic basic/a basic/b basic/c +basic/c/d basic/e +basic/e/f basic/g +basic/g/h basic/i basic/j -basic/k -basic/l -basic/c/d -basic/e/f -basic/g/h basic/j/foo +basic/k basic/k/foo -basic/l/foo basic/k/foo/bar +basic/l +basic/l/foo basic/l/foo/bar basic/l/foo/bar/baz diff --git a/tests/test_L.out b/tests/test_L.out index e24f4f7..ec9e861 100644 --- a/tests/test_L.out +++ b/tests/test_L.out @@ -1,17 +1,17 @@ links links/broken links/deeply +links/deeply/nested +links/deeply/nested/broken +links/deeply/nested/dir +links/deeply/nested/file +links/deeply/nested/link links/file links/hardlink links/notdir links/skip -links/symlink -links/deeply/nested links/skip/broken links/skip/dir links/skip/file links/skip/link -links/deeply/nested/broken -links/deeply/nested/dir -links/deeply/nested/file -links/deeply/nested/link +links/symlink diff --git a/tests/test_L_depth.out b/tests/test_L_depth.out index e24f4f7..ec9e861 100644 --- a/tests/test_L_depth.out +++ b/tests/test_L_depth.out @@ -1,17 +1,17 @@ links links/broken links/deeply +links/deeply/nested +links/deeply/nested/broken +links/deeply/nested/dir +links/deeply/nested/file +links/deeply/nested/link links/file links/hardlink links/notdir links/skip -links/symlink -links/deeply/nested links/skip/broken links/skip/dir links/skip/file links/skip/link -links/deeply/nested/broken -links/deeply/nested/dir -links/deeply/nested/file -links/deeply/nested/link +links/symlink diff --git a/tests/test_L_loops_continue.out b/tests/test_L_loops_continue.out index fbe0cac..a514555 100644 --- a/tests/test_L_loops_continue.out +++ b/tests/test_L_loops_continue.out @@ -1,11 +1,11 @@ loops loops/broken loops/deeply +loops/deeply/nested +loops/deeply/nested/dir loops/file loops/notdir loops/skip -loops/symlink -loops/deeply/nested loops/skip/dir loops/skip/loop -loops/deeply/nested/dir +loops/symlink diff --git a/tests/test_L_mount.out b/tests/test_L_mount.out index 2c3c590..2e80082 100644 --- a/tests/test_L_mount.out +++ b/tests/test_L_mount.out @@ -1,5 +1,5 @@ scratch scratch/foo -scratch/mnt scratch/foo/bar scratch/foo/qux +scratch/mnt diff --git a/tests/test_L_xdev.out b/tests/test_L_xdev.out index 2c3c590..2e80082 100644 --- a/tests/test_L_xdev.out +++ b/tests/test_L_xdev.out @@ -1,5 +1,5 @@ scratch scratch/foo -scratch/mnt scratch/foo/bar scratch/foo/qux +scratch/mnt diff --git a/tests/test_L_xtype_f.out b/tests/test_L_xtype_f.out index 78953d1..8b95397 100644 --- a/tests/test_L_xtype_f.out +++ b/tests/test_L_xtype_f.out @@ -1,4 +1,4 @@ +links/deeply/nested/file links/file links/hardlink links/skip/file -links/deeply/nested/file diff --git a/tests/test_L_xtype_l.out b/tests/test_L_xtype_l.out index 93cfc26..973864f 100644 --- a/tests/test_L_xtype_l.out +++ b/tests/test_L_xtype_l.out @@ -1,8 +1,8 @@ links/broken +links/deeply/nested/broken +links/deeply/nested/link links/notdir links/skip -links/symlink links/skip/broken links/skip/link -links/deeply/nested/broken -links/deeply/nested/link +links/symlink diff --git a/tests/test_O0.out b/tests/test_O0.out index bb3cd8d..a7ccfe4 100644 --- a/tests/test_O0.out +++ b/tests/test_O0.out @@ -2,18 +2,18 @@ basic basic/a basic/b basic/c +basic/c/d basic/e +basic/e/f basic/g +basic/g/h basic/i basic/j -basic/k -basic/l -basic/c/d -basic/e/f -basic/g/h basic/j/foo +basic/k basic/k/foo -basic/l/foo basic/k/foo/bar +basic/l +basic/l/foo basic/l/foo/bar basic/l/foo/bar/baz diff --git a/tests/test_O1.out b/tests/test_O1.out index bb3cd8d..a7ccfe4 100644 --- a/tests/test_O1.out +++ b/tests/test_O1.out |