tests: move test scripts from tests/ts/misc to dedicated subdir

This patch moves the test scripts in tests/ts/misc to subdirs
in tests/ts for each util-linux tool. It keeps the directory
structure consistent and allows to extend testing for each tool
individually. It also lays the groundwork for the test coverage
report helper script tools/testcoverage.sh.

Signed-off-by: Christian Goeschel Ndjomouo <cgoesc2@wgu.edu>

diff --git a/tests/expected/misc/bits b/tests/expected/bits/bits
similarity index 100%
rename from tests/expected/misc/bits
rename to tests/expected/bits/bits

diff --git a/tests/expected/misc/bits-and b/tests/expected/bits/bits-and
similarity index 100%
rename from tests/expected/misc/bits-and
rename to tests/expected/bits/bits-and

diff --git a/tests/expected/misc/line b/tests/expected/bits/bits-and.err
similarity index 100%
rename from tests/expected/misc/line
rename to tests/expected/bits/bits-and.err

diff --git a/tests/expected/misc/mountpoint b/tests/expected/bits/bits-and.exit_code
similarity index 100%
rename from tests/expected/misc/mountpoint
rename to tests/expected/bits/bits-and.exit_code

diff --git a/tests/expected/misc/bits-binary b/tests/expected/bits/bits-binary
similarity index 100%
rename from tests/expected/misc/bits-binary
rename to tests/expected/bits/bits-binary

diff --git a/tests/expected/bits/bits-binary.err b/tests/expected/bits/bits-binary.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/bits/bits-binary.exit_code b/tests/expected/bits/bits-binary.exit_code
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/misc/bits-default b/tests/expected/bits/bits-default
similarity index 100%
rename from tests/expected/misc/bits-default
rename to tests/expected/bits/bits-default

diff --git a/tests/expected/bits/bits-default.err b/tests/expected/bits/bits-default.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/bits/bits-default.exit_code b/tests/expected/bits/bits-default.exit_code
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/misc/bits-grouped-mask b/tests/expected/bits/bits-grouped-mask
similarity index 100%
rename from tests/expected/misc/bits-grouped-mask
rename to tests/expected/bits/bits-grouped-mask

diff --git a/tests/expected/bits/bits-grouped-mask.err b/tests/expected/bits/bits-grouped-mask.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/bits/bits-grouped-mask.exit_code b/tests/expected/bits/bits-grouped-mask.exit_code
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/misc/bits-list b/tests/expected/bits/bits-list
similarity index 100%
rename from tests/expected/misc/bits-list
rename to tests/expected/bits/bits-list

diff --git a/tests/expected/bits/bits-list.err b/tests/expected/bits/bits-list.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/bits/bits-list.exit_code b/tests/expected/bits/bits-list.exit_code
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/misc/bits-mask b/tests/expected/bits/bits-mask
similarity index 100%
rename from tests/expected/misc/bits-mask
rename to tests/expected/bits/bits-mask

diff --git a/tests/expected/bits/bits-mask.err b/tests/expected/bits/bits-mask.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/bits/bits-mask.exit_code b/tests/expected/bits/bits-mask.exit_code
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/misc/bits-not b/tests/expected/bits/bits-not
similarity index 100%
rename from tests/expected/misc/bits-not
rename to tests/expected/bits/bits-not

diff --git a/tests/expected/bits/bits-not.err b/tests/expected/bits/bits-not.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/bits/bits-not.exit_code b/tests/expected/bits/bits-not.exit_code
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/misc/bits-or b/tests/expected/bits/bits-or
similarity index 100%
rename from tests/expected/misc/bits-or
rename to tests/expected/bits/bits-or

diff --git a/tests/expected/bits/bits-or.err b/tests/expected/bits/bits-or.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/bits/bits-or.exit_code b/tests/expected/bits/bits-or.exit_code
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/misc/bits-parse-grouped-mask b/tests/expected/bits/bits-parse-grouped-mask
similarity index 100%
rename from tests/expected/misc/bits-parse-grouped-mask
rename to tests/expected/bits/bits-parse-grouped-mask

diff --git a/tests/expected/bits/bits-parse-grouped-mask.err b/tests/expected/bits/bits-parse-grouped-mask.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/bits/bits-parse-grouped-mask.exit_code b/tests/expected/bits/bits-parse-grouped-mask.exit_code
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/misc/bits-parse-mask b/tests/expected/bits/bits-parse-mask
similarity index 100%
rename from tests/expected/misc/bits-parse-mask
rename to tests/expected/bits/bits-parse-mask

diff --git a/tests/expected/bits/bits-parse-mask.err b/tests/expected/bits/bits-parse-mask.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/bits/bits-parse-mask.exit_code b/tests/expected/bits/bits-parse-mask.exit_code
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/misc/bits-parse-range b/tests/expected/bits/bits-parse-range
similarity index 100%
rename from tests/expected/misc/bits-parse-range
rename to tests/expected/bits/bits-parse-range

diff --git a/tests/expected/bits/bits-parse-range.err b/tests/expected/bits/bits-parse-range.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/bits/bits-parse-range.exit_code b/tests/expected/bits/bits-parse-range.exit_code
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/misc/bits-stdin b/tests/expected/bits/bits-stdin
similarity index 100%
rename from tests/expected/misc/bits-stdin
rename to tests/expected/bits/bits-stdin

diff --git a/tests/expected/bits/bits-stdin.err b/tests/expected/bits/bits-stdin.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/bits/bits-stdin.exit_code b/tests/expected/bits/bits-stdin.exit_code
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/misc/bits-truncate b/tests/expected/bits/bits-truncate
similarity index 100%
rename from tests/expected/misc/bits-truncate
rename to tests/expected/bits/bits-truncate

diff --git a/tests/expected/bits/bits-truncate.err b/tests/expected/bits/bits-truncate.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/bits/bits-truncate.exit_code b/tests/expected/bits/bits-truncate.exit_code
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/misc/bits-width b/tests/expected/bits/bits-width
similarity index 100%
rename from tests/expected/misc/bits-width
rename to tests/expected/bits/bits-width

diff --git a/tests/expected/misc/bits-width-truncate b/tests/expected/bits/bits-width-truncate
similarity index 100%
rename from tests/expected/misc/bits-width-truncate
rename to tests/expected/bits/bits-width-truncate

diff --git a/tests/expected/bits/bits-width-truncate.err b/tests/expected/bits/bits-width-truncate.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/bits/bits-width-truncate.exit_code b/tests/expected/bits/bits-width-truncate.exit_code
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/bits/bits-width.err b/tests/expected/bits/bits-width.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/bits/bits-width.exit_code b/tests/expected/bits/bits-width.exit_code
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/misc/bits-xor b/tests/expected/bits/bits-xor
similarity index 100%
rename from tests/expected/misc/bits-xor
rename to tests/expected/bits/bits-xor

diff --git a/tests/expected/bits/bits-xor.err b/tests/expected/bits/bits-xor.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/bits/bits-xor.exit_code b/tests/expected/bits/bits-xor.exit_code
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/bits/bits.err b/tests/expected/bits/bits.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/bits/bits.exit_code b/tests/expected/bits/bits.exit_code
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/misc/enosys-basic b/tests/expected/enosys/enosys-basic
similarity index 100%
rename from tests/expected/misc/enosys-basic
rename to tests/expected/enosys/enosys-basic

diff --git a/tests/expected/misc/enosys-exec b/tests/expected/enosys/enosys-exec
similarity index 100%
rename from tests/expected/misc/enosys-exec
rename to tests/expected/enosys/enosys-exec

diff --git a/tests/expected/misc/enosys-ioctl b/tests/expected/enosys/enosys-ioctl
similarity index 100%
rename from tests/expected/misc/enosys-ioctl
rename to tests/expected/enosys/enosys-ioctl

diff --git a/tests/expected/misc/fallocate-alloc b/tests/expected/fallocate/fallocate-alloc
similarity index 100%
rename from tests/expected/misc/fallocate-alloc
rename to tests/expected/fallocate/fallocate-alloc

diff --git a/tests/expected/misc/fallocate-dig-holes b/tests/expected/fallocate/fallocate-dig-holes
similarity index 100%
rename from tests/expected/misc/fallocate-dig-holes
rename to tests/expected/fallocate/fallocate-dig-holes

diff --git a/tests/expected/misc/fallocate-report-data-holes b/tests/expected/fallocate/fallocate-report-data-holes
similarity index 100%
rename from tests/expected/misc/fallocate-report-data-holes
rename to tests/expected/fallocate/fallocate-report-data-holes

diff --git a/tests/expected/misc/fallocate-report-file-holes b/tests/expected/fallocate/fallocate-report-file-holes
similarity index 100%
rename from tests/expected/misc/fallocate-report-file-holes
rename to tests/expected/fallocate/fallocate-report-file-holes

diff --git a/tests/expected/misc/flock b/tests/expected/flock/flock
similarity index 100%
rename from tests/expected/misc/flock
rename to tests/expected/flock/flock

diff --git a/tests/expected/misc/flock-exclusive b/tests/expected/flock/flock-exclusive
similarity index 100%
rename from tests/expected/misc/flock-exclusive
rename to tests/expected/flock/flock-exclusive

diff --git a/tests/expected/misc/flock-fcntl-exclusive b/tests/expected/flock/flock-fcntl-exclusive
similarity index 100%
rename from tests/expected/misc/flock-fcntl-exclusive
rename to tests/expected/flock/flock-fcntl-exclusive

diff --git a/tests/expected/misc/flock-fcntl-fd b/tests/expected/flock/flock-fcntl-fd
similarity index 100%
rename from tests/expected/misc/flock-fcntl-fd
rename to tests/expected/flock/flock-fcntl-fd

diff --git a/tests/expected/misc/flock-fcntl-no-fork b/tests/expected/flock/flock-fcntl-no-fork
similarity index 100%
rename from tests/expected/misc/flock-fcntl-no-fork
rename to tests/expected/flock/flock-fcntl-no-fork

diff --git a/tests/expected/misc/flock-fcntl-non-block b/tests/expected/flock/flock-fcntl-non-block
similarity index 100%
rename from tests/expected/misc/flock-fcntl-non-block
rename to tests/expected/flock/flock-fcntl-non-block

diff --git a/tests/expected/misc/flock-fcntl-shared b/tests/expected/flock/flock-fcntl-shared
similarity index 100%
rename from tests/expected/misc/flock-fcntl-shared
rename to tests/expected/flock/flock-fcntl-shared

diff --git a/tests/expected/misc/flock-fcntl-time-check b/tests/expected/flock/flock-fcntl-time-check
similarity index 100%
rename from tests/expected/misc/flock-fcntl-time-check
rename to tests/expected/flock/flock-fcntl-time-check

diff --git a/tests/expected/misc/flock-fcntl-timeout b/tests/expected/flock/flock-fcntl-timeout
similarity index 100%
rename from tests/expected/misc/flock-fcntl-timeout
rename to tests/expected/flock/flock-fcntl-timeout

diff --git a/tests/expected/misc/flock-fcntl-vs-flock b/tests/expected/flock/flock-fcntl-vs-flock
similarity index 100%
rename from tests/expected/misc/flock-fcntl-vs-flock
rename to tests/expected/flock/flock-fcntl-vs-flock

diff --git a/tests/expected/misc/flock-fd b/tests/expected/flock/flock-fd
similarity index 100%
rename from tests/expected/misc/flock-fd
rename to tests/expected/flock/flock-fd

diff --git a/tests/expected/misc/flock-no-fork b/tests/expected/flock/flock-no-fork
similarity index 100%
rename from tests/expected/misc/flock-no-fork
rename to tests/expected/flock/flock-no-fork

diff --git a/tests/expected/misc/flock-non-block b/tests/expected/flock/flock-non-block
similarity index 100%
rename from tests/expected/misc/flock-non-block
rename to tests/expected/flock/flock-non-block

diff --git a/tests/expected/misc/flock-shared b/tests/expected/flock/flock-shared
similarity index 100%
rename from tests/expected/misc/flock-shared
rename to tests/expected/flock/flock-shared

diff --git a/tests/expected/misc/flock-time-check b/tests/expected/flock/flock-time-check
similarity index 100%
rename from tests/expected/misc/flock-time-check
rename to tests/expected/flock/flock-time-check

diff --git a/tests/expected/misc/flock-timeout b/tests/expected/flock/flock-timeout
similarity index 100%
rename from tests/expected/misc/flock-timeout
rename to tests/expected/flock/flock-timeout

diff --git a/tests/expected/flock/lockfile b/tests/expected/flock/lockfile
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/flock/range-lock copy b/tests/expected/flock/range-lock copy
new file mode 100644 (file)
index 0000000..11f19e0
--- /dev/null
+++ b/tests/expected/flock/range-lock copy
@@ -0,0 +1,2 @@
+start: 1 == 1
+end: 2 == 2

diff --git a/tests/expected/misc/ionice b/tests/expected/ionice/ionice
similarity index 100%
rename from tests/expected/misc/ionice
rename to tests/expected/ionice/ionice

diff --git a/tests/expected/misc/ionice.err b/tests/expected/ionice/ionice.err
similarity index 100%
rename from tests/expected/misc/ionice.err
rename to tests/expected/ionice/ionice.err

diff --git a/tests/expected/line/line b/tests/expected/line/line
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/misc/line-empty-input b/tests/expected/line/line-empty-input
similarity index 100%
rename from tests/expected/misc/line-empty-input
rename to tests/expected/line/line-empty-input

diff --git a/tests/expected/misc/line-empty-input-wait-for-eof b/tests/expected/line/line-empty-input-wait-for-eof
similarity index 100%
rename from tests/expected/misc/line-empty-input-wait-for-eof
rename to tests/expected/line/line-empty-input-wait-for-eof

diff --git a/tests/expected/misc/line-large-line b/tests/expected/line/line-large-line
similarity index 100%
rename from tests/expected/misc/line-large-line
rename to tests/expected/line/line-large-line

diff --git a/tests/expected/misc/line-one-call b/tests/expected/line/line-one-call
similarity index 100%
rename from tests/expected/misc/line-one-call
rename to tests/expected/line/line-one-call

diff --git a/tests/expected/misc/line-text-without-eol b/tests/expected/line/line-text-without-eol
similarity index 100%
rename from tests/expected/misc/line-text-without-eol
rename to tests/expected/line/line-text-without-eol

diff --git a/tests/expected/misc/line-two-calls b/tests/expected/line/line-two-calls
similarity index 100%
rename from tests/expected/misc/line-two-calls
rename to tests/expected/line/line-two-calls

diff --git a/tests/expected/misc/line-wait-for-eof b/tests/expected/line/line-wait-for-eof
similarity index 100%
rename from tests/expected/misc/line-wait-for-eof
rename to tests/expected/line/line-wait-for-eof

diff --git a/tests/expected/misc/lsclocks-basic b/tests/expected/lsclocks/lsclocks-basic
similarity index 100%
rename from tests/expected/misc/lsclocks-basic
rename to tests/expected/lsclocks/lsclocks-basic

diff --git a/tests/expected/misc/lsclocks-cpu b/tests/expected/lsclocks/lsclocks-cpu
similarity index 100%
rename from tests/expected/misc/lsclocks-cpu
rename to tests/expected/lsclocks/lsclocks-cpu

diff --git a/tests/expected/misc/lsclocks-dynamic b/tests/expected/lsclocks/lsclocks-dynamic
similarity index 100%
rename from tests/expected/misc/lsclocks-dynamic
rename to tests/expected/lsclocks/lsclocks-dynamic

diff --git a/tests/expected/misc/lsclocks-rtc b/tests/expected/lsclocks/lsclocks-rtc
similarity index 100%
rename from tests/expected/misc/lsclocks-rtc
rename to tests/expected/lsclocks/lsclocks-rtc

diff --git a/tests/expected/misc/lsclocks-time b/tests/expected/lsclocks/lsclocks-time
similarity index 100%
rename from tests/expected/misc/lsclocks-time
rename to tests/expected/lsclocks/lsclocks-time

diff --git a/tests/expected/misc/mcookie b/tests/expected/mcookie/mcookie
similarity index 100%
rename from tests/expected/misc/mcookie
rename to tests/expected/mcookie/mcookie

diff --git a/tests/expected/mcookie/mcookie.err b/tests/expected/mcookie/mcookie.err
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/mcookie/mcookie.exit_code b/tests/expected/mcookie/mcookie.exit_code
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/misc/flock-fcntl b/tests/expected/misc/flock-fcntl
deleted file mode 100644 (file)
index 913e35e..0000000
--- a/tests/expected/misc/flock-fcntl
+++ /dev/null
@@ -1,4 +0,0 @@
-API: flock(2)
-Locking
-Unlocking
-Unlocked

diff --git a/tests/expected/mountpoint/mountpoint b/tests/expected/mountpoint/mountpoint
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/expected/misc/mountpoint-default b/tests/expected/mountpoint/mountpoint-default
similarity index 100%
rename from tests/expected/misc/mountpoint-default
rename to tests/expected/mountpoint/mountpoint-default

diff --git a/tests/expected/misc/mountpoint-mutually-exclusive b/tests/expected/mountpoint/mountpoint-mutually-exclusive
similarity index 100%
rename from tests/expected/misc/mountpoint-mutually-exclusive
rename to tests/expected/mountpoint/mountpoint-mutually-exclusive

diff --git a/tests/expected/misc/mountpoint-mutually-exclusive.err b/tests/expected/mountpoint/mountpoint-mutually-exclusive.err
similarity index 100%
rename from tests/expected/misc/mountpoint-mutually-exclusive.err
rename to tests/expected/mountpoint/mountpoint-mutually-exclusive.err

diff --git a/tests/expected/misc/mountpoint-nofollow b/tests/expected/mountpoint/mountpoint-nofollow
similarity index 100%
rename from tests/expected/misc/mountpoint-nofollow
rename to tests/expected/mountpoint/mountpoint-nofollow

diff --git a/tests/expected/misc/pipesz-exec b/tests/expected/pipesz/pipesz-exec
similarity index 100%
rename from tests/expected/misc/pipesz-exec
rename to tests/expected/pipesz/pipesz-exec

diff --git a/tests/expected/misc/pipesz-get-fd b/tests/expected/pipesz/pipesz-get-fd
similarity index 100%
rename from tests/expected/misc/pipesz-get-fd
rename to tests/expected/pipesz/pipesz-get-fd

diff --git a/tests/expected/misc/pipesz-get-fd-bad.err b/tests/expected/pipesz/pipesz-get-fd-bad.err
similarity index 100%
rename from tests/expected/misc/pipesz-get-fd-bad.err
rename to tests/expected/pipesz/pipesz-get-fd-bad.err

diff --git a/tests/expected/misc/pipesz-get-file b/tests/expected/pipesz/pipesz-get-file
similarity index 100%
rename from tests/expected/misc/pipesz-get-file
rename to tests/expected/pipesz/pipesz-get-file

diff --git a/tests/expected/misc/pipesz-get-file-bad.err b/tests/expected/pipesz/pipesz-get-file-bad.err
similarity index 100%
rename from tests/expected/misc/pipesz-get-file-bad.err
rename to tests/expected/pipesz/pipesz-get-file-bad.err

diff --git a/tests/expected/misc/pipesz-set-fd-bad.err b/tests/expected/pipesz/pipesz-set-fd-bad.err
similarity index 100%
rename from tests/expected/misc/pipesz-set-fd-bad.err
rename to tests/expected/pipesz/pipesz-set-fd-bad.err

diff --git a/tests/expected/misc/pipesz-set-file-bad.err b/tests/expected/pipesz/pipesz-set-file-bad.err
similarity index 100%
rename from tests/expected/misc/pipesz-set-file-bad.err
rename to tests/expected/pipesz/pipesz-set-file-bad.err

diff --git a/tests/expected/misc/rev b/tests/expected/rev/rev
similarity index 100%
rename from tests/expected/misc/rev
rename to tests/expected/rev/rev

diff --git a/tests/expected/misc/setarch-options b/tests/expected/setarch/setarch-options
similarity index 100%
rename from tests/expected/misc/setarch-options
rename to tests/expected/setarch/setarch-options

diff --git a/tests/expected/misc/setarch-options.err b/tests/expected/setarch/setarch-options.err
similarity index 100%
rename from tests/expected/misc/setarch-options.err
rename to tests/expected/setarch/setarch-options.err

diff --git a/tests/expected/misc/setarch-show b/tests/expected/setarch/setarch-show
similarity index 100%
rename from tests/expected/misc/setarch-show
rename to tests/expected/setarch/setarch-show

diff --git a/tests/expected/misc/setarch-uname26 b/tests/expected/setarch/setarch-uname26
similarity index 100%
rename from tests/expected/misc/setarch-uname26
rename to tests/expected/setarch/setarch-uname26

diff --git a/tests/expected/misc/setarch-uname26-version b/tests/expected/setarch/setarch-uname26-version
similarity index 100%
rename from tests/expected/misc/setarch-uname26-version
rename to tests/expected/setarch/setarch-uname26-version

diff --git a/tests/expected/misc/setpgid b/tests/expected/setpgid/setpgid
similarity index 100%
rename from tests/expected/misc/setpgid
rename to tests/expected/setpgid/setpgid

diff --git a/tests/expected/misc/setsid b/tests/expected/setsid/setsid
similarity index 100%
rename from tests/expected/misc/setsid
rename to tests/expected/setsid/setsid

diff --git a/tests/expected/misc/swaplabel b/tests/expected/swaplabel/swaplabel
similarity index 100%
rename from tests/expected/misc/swaplabel
rename to tests/expected/swaplabel/swaplabel

diff --git a/tests/expected/misc/swaplabel.err b/tests/expected/swaplabel/swaplabel.err
similarity index 100%
rename from tests/expected/misc/swaplabel.err
rename to tests/expected/swaplabel/swaplabel.err

diff --git a/tests/expected/misc/waitpid-count b/tests/expected/waitpid/waitpid-count
similarity index 100%
rename from tests/expected/misc/waitpid-count
rename to tests/expected/waitpid/waitpid-count

diff --git a/tests/expected/misc/waitpid-count.err b/tests/expected/waitpid/waitpid-count.err
similarity index 100%
rename from tests/expected/misc/waitpid-count.err
rename to tests/expected/waitpid/waitpid-count.err

diff --git a/tests/expected/misc/waitpid-exited.err b/tests/expected/waitpid/waitpid-exited.err
similarity index 100%
rename from tests/expected/misc/waitpid-exited.err
rename to tests/expected/waitpid/waitpid-exited.err

diff --git a/tests/expected/misc/waitpid-normal b/tests/expected/waitpid/waitpid-normal
similarity index 100%
rename from tests/expected/misc/waitpid-normal
rename to tests/expected/waitpid/waitpid-normal

diff --git a/tests/expected/misc/waitpid-timeout b/tests/expected/waitpid/waitpid-timeout
similarity index 100%
rename from tests/expected/misc/waitpid-timeout
rename to tests/expected/waitpid/waitpid-timeout

diff --git a/tests/expected/misc/whereis b/tests/expected/whereis/whereis
similarity index 100%
rename from tests/expected/misc/whereis
rename to tests/expected/whereis/whereis

diff --git a/tests/ts/misc/bits b/tests/ts/bits/bits
similarity index 100%
rename from tests/ts/misc/bits
rename to tests/ts/bits/bits

diff --git a/tests/ts/misc/enosys b/tests/ts/enosys/enosys
similarity index 100%
rename from tests/ts/misc/enosys
rename to tests/ts/enosys/enosys

diff --git a/tests/ts/misc/fallocate b/tests/ts/fallocate/fallocate
similarity index 100%
rename from tests/ts/misc/fallocate
rename to tests/ts/fallocate/fallocate

diff --git a/tests/ts/misc/flock b/tests/ts/flock/flock
similarity index 100%
rename from tests/ts/misc/flock
rename to tests/ts/flock/flock

diff --git a/tests/ts/misc/ionice b/tests/ts/ionice/ionice
similarity index 100%
rename from tests/ts/misc/ionice
rename to tests/ts/ionice/ionice

diff --git a/tests/ts/misc/line b/tests/ts/line/line
similarity index 100%
rename from tests/ts/misc/line
rename to tests/ts/line/line

diff --git a/tests/ts/misc/lsclocks b/tests/ts/lsclocks/lsclocks
similarity index 100%
rename from tests/ts/misc/lsclocks
rename to tests/ts/lsclocks/lsclocks

diff --git a/tests/ts/misc/mcookie b/tests/ts/mcookie/mcookie
similarity index 100%
rename from tests/ts/misc/mcookie
rename to tests/ts/mcookie/mcookie

diff --git a/tests/ts/misc/mountpoint b/tests/ts/mountpoint/mountpoint
similarity index 100%
rename from tests/ts/misc/mountpoint
rename to tests/ts/mountpoint/mountpoint

diff --git a/tests/ts/misc/pipesz b/tests/ts/pipesz/pipesz
similarity index 100%
rename from tests/ts/misc/pipesz
rename to tests/ts/pipesz/pipesz

diff --git a/tests/ts/misc/rev b/tests/ts/rev/rev
similarity index 100%
rename from tests/ts/misc/rev
rename to tests/ts/rev/rev

diff --git a/tests/ts/misc/setarch b/tests/ts/setarch/setarch
similarity index 100%
rename from tests/ts/misc/setarch
rename to tests/ts/setarch/setarch

diff --git a/tests/ts/misc/setpgid b/tests/ts/setpgid/setpgid
similarity index 100%
rename from tests/ts/misc/setpgid
rename to tests/ts/setpgid/setpgid

diff --git a/tests/ts/misc/setsid b/tests/ts/setsid/setsid
similarity index 100%
rename from tests/ts/misc/setsid
rename to tests/ts/setsid/setsid

diff --git a/tests/ts/misc/swaplabel b/tests/ts/swaplabel/swaplabel
similarity index 100%
rename from tests/ts/misc/swaplabel
rename to tests/ts/swaplabel/swaplabel

diff --git a/tests/ts/misc/waitpid b/tests/ts/waitpid/waitpid
similarity index 100%
rename from tests/ts/misc/waitpid
rename to tests/ts/waitpid/waitpid

diff --git a/tests/ts/misc/whereis b/tests/ts/whereis/whereis
similarity index 100%
rename from tests/ts/misc/whereis
rename to tests/ts/whereis/whereis