tests: move tests to a directory per utility

* cfg.mk: Adjust syntax check exclusion paths.
* tests/local.mk: Adjust for renamed tests.

cfg.mk

@@ -346,7 +346,7 @@ FILTER_LONG_LINES =						\
   \|^[^:]*NEWS:.*https\{,1\}://| d;					\
   \|^[^:]*doc/fdl.texi:| d;					\
   \|^[^:]*man/help2man:| d;					\
-  \|^[^:]*tests/misc/sha[0-9]*sum.*\.pl[-:]| d;			\
+  \|^[^:]*tests/cksum/sha[0-9]*sum.*\.pl[-:]| d;			\
   \|^[^:]*tests/pr/|{ \|^[^:]*tests/pr/pr-tests:| !d; };
 sc_long_lines:
 	@wc -L /dev/null >/dev/null 2>/dev/null				\
@@ -888,7 +888,7 @@ exclude_file_name_regexp--sc_prohibit_stat_st_blocks = \
 exclude_file_name_regexp--sc_prohibit_continued_string_alpha_in_column_1 = \
   ^src/(system\.h|od\.c|printf\.c|getlimits\.c)$$
 
-_cksum = ^tests/misc/cksum-base64\.pl$$
+_cksum = ^tests/cksum/cksum-base64\.pl$$
 exclude_file_name_regexp--sc_prohibit_test_backticks = \
   ^tests/(local\.mk|(init|misc/stdbuf|factor/create-test)\.sh)$$|$(_cksum)
 

tests/local.mk

@@ -124,10 +124,10 @@ all_root_tests =				\
   tests/install/install-C-root.sh		\
   tests/ls/capability.sh			\
   tests/ls/nameless-uid.sh			\
-  tests/misc/chcon.sh				\
+  tests/chcon/chcon.sh				\
-  tests/misc/chroot-credentials.sh		\
+  tests/chroot/chroot-credentials.sh		\
   tests/misc/selinux.sh				\
-  tests/misc/truncate-owned-by-other.sh		\
+  tests/truncate/truncate-owned-by-other.sh	\
   tests/mkdir/writable-under-readonly.sh	\
   tests/mkdir/smack-root.sh			\
   tests/mv/hardlink-case.sh			\
@@ -137,8 +137,8 @@ all_root_tests =				\
   tests/rm/one-file-system.sh			\
   tests/rm/read-only.sh				\
   tests/rm/empty-immutable-skip.sh		\
-  tests/tail-2/append-only.sh			\
+  tests/tail/append-only.sh			\
-  tests/tail-2/end-of-device.sh			\
+  tests/tail/end-of-device.sh			\
   tests/touch/now-owned-by-other.sh
 
 ALL_RECURSIVE_TARGETS += check-root
@@ -163,31 +163,31 @@ check-root:
 # Put head-elide-tail early, because it's long-running.
 
 all_tests =					\
-  tests/misc/help-version.sh			\
+  tests/help/help-version.sh			\
-  tests/misc/help-version-getopt.sh		\
+  tests/help/help-version-getopt.sh		\
-  tests/tail-2/inotify-race.sh			\
+  tests/tail/inotify-race.sh			\
-  tests/tail-2/inotify-race2.sh			\
+  tests/tail/inotify-race2.sh			\
   tests/misc/invalid-opt.pl			\
   tests/rm/ext3-perf.sh				\
   tests/rm/cycle.sh				\
   tests/cp/link-heap.sh				\
   tests/cp/no-ctx.sh				\
-  tests/misc/tty-eof.pl				\
+  tests/tty/tty-eof.pl				\
   tests/misc/read-errors.sh			\
-  tests/tail-2/inotify-hash-abuse.sh		\
+  tests/tail/inotify-hash-abuse.sh		\
-  tests/tail-2/inotify-hash-abuse2.sh		\
+  tests/tail/inotify-hash-abuse2.sh		\
-  tests/tail-2/F-vs-missing.sh			\
+  tests/tail/F-vs-missing.sh			\
-  tests/tail-2/F-vs-rename.sh			\
+  tests/tail/F-vs-rename.sh			\
-  tests/tail-2/F-headers.sh			\
+  tests/tail/F-headers.sh			\
-  tests/tail-2/descriptor-vs-rename.sh		\
+  tests/tail/descriptor-vs-rename.sh		\
-  tests/tail-2/inotify-rotate.sh		\
+  tests/tail/inotify-rotate.sh			\
-  tests/tail-2/inotify-rotate-resources.sh	\
+  tests/tail/inotify-rotate-resources.sh	\
-  tests/tail-2/inotify-dir-recreate.sh		\
+  tests/tail/inotify-dir-recreate.sh		\
-  tests/tail-2/inotify-only-regular.sh		\
+  tests/tail/inotify-only-regular.sh		\
   tests/chmod/no-x.sh				\
   tests/chgrp/basic.sh				\
   tests/rm/dangling-symlink.sh			\
-  tests/misc/ls-time.sh				\
+  tests/ls/ls-time.sh				\
   tests/rm/d-1.sh				\
   tests/rm/d-2.sh				\
   tests/rm/d-3.sh				\
@@ -202,7 +202,7 @@ all_tests =					\
   tests/rm/f-1.sh				\
   tests/rm/fail-eacces.sh			\
   tests/rm/fail-eperm.xpl			\
-  tests/tail-2/assert.sh			\
+  tests/tail/assert.sh				\
   tests/rm/hash.sh				\
   tests/rm/i-1.sh				\
   tests/rm/i-never.sh				\
@@ -242,159 +242,159 @@ all_tests =					\
   tests/fmt/long-line.sh			\
   tests/fmt/non-space.sh			\
   tests/misc/echo.sh				\
-  tests/misc/env.sh				\
+  tests/env/env.sh				\
-  tests/misc/env-signal-handler.sh		\
+  tests/env/env-signal-handler.sh		\
-  tests/misc/ptx.pl				\
+  tests/ptx/ptx.pl				\
-  tests/misc/test.pl				\
+  tests/test/test.pl				\
-  tests/misc/seq.pl				\
+  tests/seq/seq.pl				\
-  tests/misc/seq-epipe.sh			\
+  tests/seq/seq-epipe.sh			\
-  tests/misc/seq-extra-number.sh		\
+  tests/seq/seq-extra-number.sh			\
-  tests/misc/seq-io-errors.sh			\
+  tests/seq/seq-io-errors.sh			\
-  tests/misc/seq-locale.sh			\
+  tests/seq/seq-locale.sh			\
-  tests/misc/seq-long-double.sh			\
+  tests/seq/seq-long-double.sh			\
-  tests/misc/seq-precision.sh			\
+  tests/seq/seq-precision.sh			\
-  tests/misc/head.pl				\
+  tests/head/head.pl				\
-  tests/misc/head-elide-tail.pl			\
+  tests/head/head-elide-tail.pl			\
-  tests/tail-2/tail-n0f.sh			\
+  tests/tail/tail-n0f.sh			\
-  tests/misc/ls-misc.pl				\
+  tests/ls/ls-misc.pl				\
-  tests/misc/date.pl				\
+  tests/date/date.pl				\
-  tests/misc/date-next-dow.pl			\
+  tests/date/date-next-dow.pl			\
-  tests/misc/ptx-overrun.sh			\
+  tests/ptx/ptx-overrun.sh			\
   tests/misc/xstrtol.pl				\
-  tests/tail-2/overlay-headers.sh		\
+  tests/tail/overlay-headers.sh			\
-  tests/tail-2/pid.sh				\
+  tests/tail/pid.sh				\
-  tests/misc/od.pl				\
+  tests/od/od.pl				\
-  tests/misc/od-endian.sh			\
+  tests/od/od-endian.sh				\
-  tests/misc/od-float.sh			\
+  tests/od/od-float.sh				\
   tests/misc/mktemp.pl				\
   tests/misc/arch.sh				\
   tests/misc/join.pl				\
   tests/pr/pr-tests.pl				\
-  tests/misc/pwd-option.sh			\
+  tests/pwd/pwd-option.sh			\
-  tests/misc/chcon-fail.sh			\
+  tests/chcon/chcon-fail.sh			\
   tests/misc/coreutils.sh			\
-  tests/misc/cut.pl				\
+  tests/cut/cut.pl				\
-  tests/misc/cut-huge-range.sh			\
+  tests/cut/cut-huge-range.sh			\
-  tests/misc/wc.pl				\
+  tests/wc/wc.pl				\
-  tests/misc/wc-files0-from.pl			\
+  tests/wc/wc-files0-from.pl			\
-  tests/misc/wc-files0.sh			\
+  tests/wc/wc-files0.sh				\
-  tests/misc/wc-nbsp.sh				\
+  tests/wc/wc-nbsp.sh				\
-  tests/misc/wc-parallel.sh			\
+  tests/wc/wc-parallel.sh			\
-  tests/misc/wc-proc.sh				\
+  tests/wc/wc-proc.sh				\
-  tests/misc/wc-total.sh			\
+  tests/wc/wc-total.sh				\
-  tests/misc/cat-E.sh				\
+  tests/cat/cat-E.sh				\
-  tests/misc/cat-proc.sh			\
+  tests/cat/cat-proc.sh				\
-  tests/misc/cat-buf.sh				\
+  tests/cat/cat-buf.sh				\
-  tests/misc/cat-self.sh			\
+  tests/cat/cat-self.sh				\
   tests/misc/base64.pl				\
   tests/misc/basename.pl			\
   tests/misc/basenc.pl				\
   tests/misc/close-stdout.sh			\
-  tests/misc/chroot-fail.sh			\
+  tests/chroot/chroot-fail.sh			\
-  tests/misc/cksum.sh				\
+  tests/cksum/cksum.sh				\
-  tests/misc/cksum-a.sh				\
+  tests/cksum/cksum-a.sh			\
-  tests/misc/cksum-c.sh				\
+  tests/cksum/cksum-c.sh			\
-  tests/misc/cksum-base64.pl			\
+  tests/cksum/cksum-base64.pl			\
-  tests/misc/cksum-raw.sh			\
+  tests/cksum/cksum-raw.sh			\
   tests/misc/comm.pl				\
-  tests/misc/csplit.sh				\
+  tests/csplit/csplit.sh			\
-  tests/misc/csplit-1000.sh			\
+  tests/csplit/csplit-1000.sh			\
-  tests/misc/csplit-heap.sh			\
+  tests/csplit/csplit-heap.sh			\
-  tests/misc/csplit-io-err.sh			\
+  tests/csplit/csplit-io-err.sh			\
-  tests/misc/csplit-suppress-matched.pl		\
+  tests/csplit/csplit-suppress-matched.pl	\
-  tests/misc/date-debug.sh			\
+  tests/date/date-debug.sh			\
-  tests/misc/date-sec.sh			\
+  tests/date/date-sec.sh			\
-  tests/misc/date-tz.sh				\
+  tests/date/date-tz.sh				\
   tests/misc/dircolors.pl			\
   tests/misc/dirname.pl				\
-  tests/misc/env-null.sh			\
+  tests/env/env-null.sh				\
-  tests/misc/env-S.pl				\
+  tests/env/env-S.pl				\
-  tests/misc/env-S-script.sh			\
+  tests/env/env-S-script.sh			\
   tests/misc/expand.pl				\
-  tests/misc/expr.pl				\
+  tests/expr/expr.pl				\
-  tests/misc/expr-multibyte.pl			\
+  tests/expr/expr-multibyte.pl			\
-  tests/misc/factor.pl				\
+  tests/factor/factor.pl			\
-  tests/misc/factor-parallel.sh			\
+  tests/factor/factor-parallel.sh		\
   tests/misc/false-status.sh			\
   tests/misc/fold.pl				\
-  tests/misc/groups-dash.sh			\
+  tests/groups/groups-dash.sh			\
-  tests/misc/groups-process-all.sh		\
+  tests/groups/groups-process-all.sh		\
-  tests/misc/groups-version.sh			\
+  tests/groups/groups-version.sh		\
-  tests/misc/head-c.sh				\
+  tests/head/head-c.sh				\
-  tests/misc/head-pos.sh			\
+  tests/head/head-pos.sh			\
-  tests/misc/head-write-error.sh		\
+  tests/head/head-write-error.sh		\
   tests/misc/kill.sh				\
-  tests/misc/b2sum.sh				\
+  tests/cksum/b2sum.sh				\
-  tests/misc/md5sum.pl				\
+  tests/cksum/md5sum.pl				\
-  tests/misc/md5sum-bsd.sh			\
+  tests/cksum/md5sum-bsd.sh			\
-  tests/misc/md5sum-newline.pl			\
+  tests/cksum/md5sum-newline.pl			\
-  tests/misc/md5sum-parallel.sh			\
+  tests/cksum/md5sum-parallel.sh		\
   tests/misc/mknod.sh				\
-  tests/misc/nice.sh				\
+  tests/nice/nice.sh				\
-  tests/misc/nice-fail.sh			\
+  tests/nice/nice-fail.sh			\
   tests/misc/nl.sh				\
   tests/misc/nohup.sh				\
-  tests/misc/nproc-avail.sh			\
+  tests/nproc/nproc-avail.sh			\
-  tests/misc/nproc-positive.sh			\
+  tests/nproc/nproc-positive.sh			\
-  tests/misc/nproc-override.sh			\
+  tests/nproc/nproc-override.sh			\
   tests/misc/numfmt.pl				\
-  tests/misc/od-N.sh				\
+  tests/od/od-N.sh				\
-  tests/misc/od-j.sh				\
+  tests/od/od-j.sh				\
-  tests/misc/od-multiple-t.sh			\
+  tests/od/od-multiple-t.sh			\
-  tests/misc/od-x8.sh				\
+  tests/od/od-x8.sh				\
   tests/misc/paste.pl				\
-  tests/misc/pathchk1.sh			\
+  tests/misc/pathchk.sh				\
   tests/misc/printenv.sh			\
-  tests/misc/printf.sh				\
+  tests/printf/printf.sh			\
-  tests/misc/printf-cov.pl			\
+  tests/printf/printf-cov.pl			\
-  tests/misc/printf-hex.sh			\
+  tests/printf/printf-hex.sh			\
-  tests/misc/printf-mb.sh			\
+  tests/printf/printf-mb.sh			\
-  tests/misc/printf-surprise.sh			\
+  tests/printf/printf-surprise.sh		\
-  tests/misc/printf-quote.sh			\
+  tests/printf/printf-quote.sh			\
-  tests/misc/pwd-long.sh			\
+  tests/pwd/pwd-long.sh				\
-  tests/misc/readlink-fp-loop.sh		\
+  tests/readlink/readlink-fp-loop.sh		\
-  tests/misc/readlink-root.sh			\
+  tests/readlink/readlink-root.sh		\
   tests/misc/realpath.sh			\
-  tests/misc/runcon-compute.sh			\
+  tests/runcon/runcon-compute.sh		\
-  tests/misc/runcon-no-reorder.sh		\
+  tests/runcon/runcon-no-reorder.sh		\
-  tests/misc/sha1sum.pl				\
+  tests/cksum/sha1sum.pl			\
-  tests/misc/sha1sum-vec.pl			\
+  tests/cksum/sha1sum-vec.pl			\
-  tests/misc/sha224sum.pl			\
+  tests/cksum/sha224sum.pl			\
-  tests/misc/sha256sum.pl			\
+  tests/cksum/sha256sum.pl			\
-  tests/misc/sha384sum.pl			\
+  tests/cksum/sha384sum.pl			\
-  tests/misc/sha512sum.pl			\
+  tests/cksum/sha512sum.pl			\
-  tests/misc/shred-exact.sh			\
+  tests/shred/shred-exact.sh			\
-  tests/misc/shred-passes.sh			\
+  tests/shred/shred-passes.sh			\
-  tests/misc/shred-remove.sh			\
+  tests/shred/shred-remove.sh			\
-  tests/misc/shred-size.sh			\
+  tests/shred/shred-size.sh			\
-  tests/misc/shuf.sh				\
+  tests/shuf/shuf.sh				\
-  tests/misc/shuf-reservoir.sh			\
+  tests/shuf/shuf-reservoir.sh			\
   tests/misc/sleep.sh				\
-  tests/misc/sm3sum.pl				\
+  tests/cksum/sm3sum.pl				\
-  tests/misc/sort.pl				\
+  tests/sort/sort.pl				\
-  tests/misc/sort-benchmark-random.sh		\
+  tests/sort/sort-benchmark-random.sh		\
-  tests/misc/sort-compress.sh			\
+  tests/sort/sort-compress.sh			\
-  tests/misc/sort-compress-hang.sh		\
+  tests/sort/sort-compress-hang.sh		\
-  tests/misc/sort-compress-proc.sh		\
+  tests/sort/sort-compress-proc.sh		\
-  tests/misc/sort-continue.sh			\
+  tests/sort/sort-continue.sh			\
-  tests/misc/sort-debug-keys.sh			\
+  tests/sort/sort-debug-keys.sh			\
-  tests/misc/sort-debug-warn.sh			\
+  tests/sort/sort-debug-warn.sh			\
-  tests/misc/sort-discrim.sh			\
+  tests/sort/sort-discrim.sh			\
-  tests/misc/sort-files0-from.pl		\
+  tests/sort/sort-files0-from.pl		\
-  tests/misc/sort-float.sh			\
+  tests/sort/sort-float.sh			\
-  tests/misc/sort-h-thousands-sep.sh		\
+  tests/sort/sort-h-thousands-sep.sh		\
-  tests/misc/sort-merge.pl			\
+  tests/sort/sort-merge.pl			\
-  tests/misc/sort-merge-fdlimit.sh		\
+  tests/sort/sort-merge-fdlimit.sh		\
-  tests/misc/sort-month.sh			\
+  tests/sort/sort-month.sh			\
-  tests/misc/sort-exit-early.sh			\
+  tests/sort/sort-exit-early.sh			\
-  tests/misc/sort-rand.sh			\
+  tests/sort/sort-rand.sh			\
-  tests/misc/sort-spinlock-abuse.sh		\
+  tests/sort/sort-spinlock-abuse.sh		\
-  tests/misc/sort-stale-thread-mem.sh		\
+  tests/sort/sort-stale-thread-mem.sh		\
-  tests/misc/sort-unique.sh			\
+  tests/sort/sort-unique.sh			\
-  tests/misc/sort-unique-segv.sh		\
+  tests/sort/sort-unique-segv.sh		\
-  tests/misc/sort-version.sh			\
+  tests/sort/sort-version.sh			\
-  tests/misc/sort-NaN-infloop.sh		\
+  tests/sort/sort-NaN-infloop.sh		\
-  tests/misc/sort-u-FMR.sh			\
+  tests/sort/sort-u-FMR.sh			\
   tests/split/filter.sh				\
   tests/split/suffix-auto-length.sh		\
   tests/split/suffix-length.sh			\
@@ -408,58 +408,58 @@ all_tests =					\
   tests/split/record-sep.sh			\
   tests/split/numeric.sh			\
   tests/split/guard-input.sh			\
-  tests/misc/stat-birthtime.sh			\
+  tests/stat/stat-birthtime.sh			\
-  tests/misc/stat-fmt.sh			\
+  tests/stat/stat-fmt.sh			\
-  tests/misc/stat-hyphen.sh			\
+  tests/stat/stat-hyphen.sh			\
-  tests/misc/stat-mount.sh			\
+  tests/stat/stat-mount.sh			\
-  tests/misc/stat-nanoseconds.sh		\
+  tests/stat/stat-nanoseconds.sh		\
-  tests/misc/stat-printf.pl			\
+  tests/stat/stat-printf.pl			\
-  tests/misc/stat-slash.sh			\
+  tests/stat/stat-slash.sh			\
   tests/misc/stdbuf.sh				\
-  tests/misc/stty.sh				\
+  tests/stty/stty.sh				\
-  tests/misc/stty-invalid.sh			\
+  tests/stty/stty-invalid.sh			\
-  tests/misc/stty-pairs.sh			\
+  tests/stty/stty-pairs.sh			\
-  tests/misc/stty-row-col.sh			\
+  tests/stty/stty-row-col.sh			\
-  tests/misc/sum.pl				\
+  tests/cksum/sum.pl				\
-  tests/misc/sum-sysv.sh			\
+  tests/cksum/sum-sysv.sh			\
   tests/misc/sync.sh				\
-  tests/misc/tac.pl				\
+  tests/tac/tac.pl				\
-  tests/misc/tac-continue.sh			\
+  tests/tac/tac-continue.sh			\
-  tests/misc/tac-2-nonseekable.sh		\
+  tests/tac/tac-2-nonseekable.sh		\
-  tests/misc/tail.pl				\
+  tests/tail/tail.pl				\
   tests/misc/tee.sh				\
-  tests/misc/test-N.sh				\
+  tests/test/test-N.sh				\
-  tests/misc/test-diag.pl			\
+  tests/test/test-diag.pl			\
   tests/misc/time-style.sh			\
-  tests/misc/timeout.sh				\
+  tests/timeout/timeout.sh			\
-  tests/misc/timeout-blocked.pl			\
+  tests/timeout/timeout-blocked.pl		\
-  tests/misc/timeout-group.sh			\
+  tests/timeout/timeout-group.sh		\
-  tests/misc/timeout-large-parameters.sh	\
+  tests/timeout/timeout-large-parameters.sh	\
-  tests/misc/timeout-parameters.sh		\
+  tests/timeout/timeout-parameters.sh		\
-  tests/misc/tr.pl				\
+  tests/tr/tr.pl				\
-  tests/misc/tr-case-class.sh			\
+  tests/tr/tr-case-class.sh			\
-  tests/misc/truncate-dangling-symlink.sh	\
+  tests/truncate/truncate-dangling-symlink.sh	\
-  tests/misc/truncate-dir-fail.sh		\
+  tests/truncate/truncate-dir-fail.sh		\
-  tests/misc/truncate-fail-diag.sh		\
+  tests/truncate/truncate-fail-diag.sh		\
-  tests/misc/truncate-fifo.sh			\
+  tests/truncate/truncate-fifo.sh		\
-  tests/misc/truncate-no-create-missing.sh	\
+  tests/truncate/truncate-no-create-missing.sh	\
-  tests/misc/truncate-overflow.sh		\
+  tests/truncate/truncate-overflow.sh		\
-  tests/misc/truncate-parameters.sh		\
+  tests/truncate/truncate-parameters.sh		\
-  tests/misc/truncate-relative.sh		\
+  tests/truncate/truncate-relative.sh		\
   tests/misc/tsort.pl				\
-  tests/misc/tty.sh				\
+  tests/tty/tty.sh				\
   tests/misc/usage_vs_getopt.sh			\
   tests/misc/unexpand.pl			\
-  tests/misc/uniq.pl				\
+  tests/uniq/uniq.pl				\
-  tests/misc/uniq-perf.sh			\
+  tests/uniq/uniq-perf.sh			\
-  tests/misc/uniq-collate.sh			\
+  tests/uniq/uniq-collate.sh			\
   tests/misc/xattr.sh				\
   tests/misc/yes.sh				\
-  tests/tail-2/wait.sh				\
+  tests/tail/wait.sh				\
-  tests/tail-2/retry.sh				\
+  tests/tail/retry.sh				\
-  tests/tail-2/symlink.sh			\
+  tests/tail/symlink.sh				\
-  tests/tail-2/tail-c.sh			\
+  tests/tail/tail-c.sh				\
-  tests/tail-2/truncate.sh			\
+  tests/tail/truncate.sh			\
   tests/chmod/c-option.sh			\
   tests/chmod/equal-x.sh			\
   tests/chmod/equals.sh				\
@@ -714,15 +714,15 @@ all_tests =					\
   tests/rmdir/ignore.sh				\
   tests/rmdir/symlink-errors.sh			\
   tests/rmdir/t-slash.sh			\
-  tests/tail-2/assert-2.sh			\
+  tests/tail/assert-2.sh			\
-  tests/tail-2/big-4gb.sh			\
+  tests/tail/big-4gb.sh				\
-  tests/tail-2/flush-initial.sh			\
+  tests/tail/flush-initial.sh			\
-  tests/tail-2/follow-name.sh			\
+  tests/tail/follow-name.sh			\
-  tests/tail-2/follow-stdin.sh			\
+  tests/tail/follow-stdin.sh			\
-  tests/tail-2/pipe-f.sh			\
+  tests/tail/pipe-f.sh				\
-  tests/tail-2/pipe-f2.sh			\
+  tests/tail/pipe-f2.sh				\
-  tests/tail-2/proc-ksyms.sh			\
+  tests/tail/proc-ksyms.sh			\
-  tests/tail-2/start-middle.sh			\
+  tests/tail/start-middle.sh			\
   tests/touch/60-seconds.sh			\
   tests/touch/dangling-symlink.sh		\
   tests/touch/dir-1.sh				\