diff options
author | Thomas Weißschuh <thomas@t-8ch.de> | 2022-10-10 14:34:58 +0200 |
---|---|---|
committer | Thomas Weißschuh <thomas@t-8ch.de> | 2022-10-18 00:00:20 +0200 |
commit | 7b29718dc4c2878d06920079ae332dfeb813d198 (patch) | |
tree | a0297754043857077467575daf4b65b8a81572e8 | |
parent | 8c4feb933b1ee261bb7468c77aa01470c2a201e8 (diff) | |
download | util-linux-7b29718dc4c2878d06920079ae332dfeb813d198.tar.gz |
tests: disable nonfunctional tests under qemu user emulation
-rw-r--r-- | tests/functions.sh | 6 | ||||
-rwxr-xr-x | tests/ts/colcrt/functional | 1 | ||||
-rwxr-xr-x | tests/ts/colcrt/regressions | 1 | ||||
-rwxr-xr-x | tests/ts/column/table | 1 | ||||
-rwxr-xr-x | tests/ts/kill/name_to_number | 3 | ||||
-rwxr-xr-x | tests/ts/lsfd/column-ainodeclass | 1 | ||||
-rwxr-xr-x | tests/ts/lsfd/column-name | 1 | ||||
-rwxr-xr-x | tests/ts/lsfd/column-type | 1 | ||||
-rwxr-xr-x | tests/ts/lsfd/mkfds-mapped-packet-socket | 1 | ||||
-rwxr-xr-x | tests/ts/lsfd/mkfds-ro-block-device | 1 | ||||
-rwxr-xr-x | tests/ts/lsfd/mkfds-tcp | 1 | ||||
-rwxr-xr-x | tests/ts/lsfd/mkfds-unix-in-netns | 1 | ||||
-rwxr-xr-x | tests/ts/mount/fstab-broken | 1 | ||||
-rwxr-xr-x | tests/ts/mount/fstab-none | 1 | ||||
-rwxr-xr-x | tests/ts/mount/move | 1 |
15 files changed, 22 insertions, 0 deletions
diff --git a/tests/functions.sh b/tests/functions.sh index 216b66e64..96915aee6 100644 --- a/tests/functions.sh +++ b/tests/functions.sh @@ -134,6 +134,12 @@ function ts_skip_nonroot { fi } +function ts_skip_qemu_user { + if [ "$QEMU_USER" == "1" ]; then + ts_skip "running under qemu-user emulation" + fi +} + function ts_failed_subtest { local msg="FAILED" local ret=1 diff --git a/tests/ts/colcrt/functional b/tests/ts/colcrt/functional index 3e8cc3862..f3c290a5f 100755 --- a/tests/ts/colcrt/functional +++ b/tests/ts/colcrt/functional @@ -19,6 +19,7 @@ TS_DESC="functional" export LC_CTYPE='C' . $TS_TOPDIR/functions.sh +ts_skip_qemu_user # https://gitlab.com/qemu-project/qemu/-/issues/1248 ts_init "$*" ts_check_test_command "$TS_CMD_COLCRT" diff --git a/tests/ts/colcrt/regressions b/tests/ts/colcrt/regressions index 130ad9a5a..c4ccb531c 100755 --- a/tests/ts/colcrt/regressions +++ b/tests/ts/colcrt/regressions @@ -17,6 +17,7 @@ TS_TOPDIR="${0%/*}/../.." TS_DESC="regressions" . $TS_TOPDIR/functions.sh +ts_skip_qemu_user # https://gitlab.com/qemu-project/qemu/-/issues/1248 ts_init "$*" ts_check_test_command "$TS_CMD_COLCRT" diff --git a/tests/ts/column/table b/tests/ts/column/table index 0ef53888e..a9381aac5 100755 --- a/tests/ts/column/table +++ b/tests/ts/column/table @@ -19,6 +19,7 @@ TS_TOPDIR="${0%/*}/../.." TS_DESC="table" . $TS_TOPDIR/functions.sh +ts_skip_qemu_user # https://gitlab.com/qemu-project/qemu/-/issues/1248 ts_init "$*" ts_check_test_command "$TS_CMD_COLUMN" diff --git a/tests/ts/kill/name_to_number b/tests/ts/kill/name_to_number index 8a7f4bef0..955d861ec 100755 --- a/tests/ts/kill/name_to_number +++ b/tests/ts/kill/name_to_number @@ -26,6 +26,9 @@ fi ts_check_test_command "$TS_CMD_KILL" ts_check_test_command "$TS_HELPER_SIGRECEIVE" +# SIGRTMAX-0 and SIGRTMAX-1 are not usable under QEMU +ts_skip_qemu_user + . "$TS_SELF/kill_functions.sh" all_ok=true diff --git a/tests/ts/lsfd/column-ainodeclass b/tests/ts/lsfd/column-ainodeclass index 3db9189de..2096c5b0c 100755 --- a/tests/ts/lsfd/column-ainodeclass +++ b/tests/ts/lsfd/column-ainodeclass @@ -22,6 +22,7 @@ ts_init "$*" ts_check_test_command "$TS_CMD_LSFD" ts_check_test_command "$TS_HELPER_MKFDS" +ts_skip_qemu_user ts_cd "$TS_OUTDIR" diff --git a/tests/ts/lsfd/column-name b/tests/ts/lsfd/column-name index f87296c9a..3d5658260 100755 --- a/tests/ts/lsfd/column-name +++ b/tests/ts/lsfd/column-name @@ -23,6 +23,7 @@ ts_init "$*" ts_check_test_command "$TS_CMD_LSFD" ts_check_test_command "$TS_HELPER_MKFDS" ts_check_prog "sed" +ts_skip_qemu_user ts_cd "$TS_OUTDIR" diff --git a/tests/ts/lsfd/column-type b/tests/ts/lsfd/column-type index d31b71254..4b69ec751 100755 --- a/tests/ts/lsfd/column-type +++ b/tests/ts/lsfd/column-type @@ -22,6 +22,7 @@ ts_init "$*" ts_check_test_command "$TS_CMD_LSFD" ts_check_test_command "$TS_HELPER_MKFDS" +ts_skip_qemu_user ts_cd "$TS_OUTDIR" diff --git a/tests/ts/lsfd/mkfds-mapped-packet-socket b/tests/ts/lsfd/mkfds-mapped-packet-socket index 1efa75492..abb012738 100755 --- a/tests/ts/lsfd/mkfds-mapped-packet-socket +++ b/tests/ts/lsfd/mkfds-mapped-packet-socket @@ -20,6 +20,7 @@ TS_DESC="mmap'ed AF_PACKET socket" . $TS_TOPDIR/functions.sh ts_init "$*" ts_skip_nonroot +ts_skip_qemu_user . $TS_SELF/lsfd-functions.bash diff --git a/tests/ts/lsfd/mkfds-ro-block-device b/tests/ts/lsfd/mkfds-ro-block-device index 86c1ba874..2ba2a97d7 100755 --- a/tests/ts/lsfd/mkfds-ro-block-device +++ b/tests/ts/lsfd/mkfds-ro-block-device @@ -20,6 +20,7 @@ TS_DESC="block device with O_RDONLY" . $TS_TOPDIR/functions.sh ts_init "$*" ts_skip_nonroot +ts_skip_qemu_user . $TS_SELF/lsfd-functions.bash diff --git a/tests/ts/lsfd/mkfds-tcp b/tests/ts/lsfd/mkfds-tcp index 129e74b0b..f74333f64 100755 --- a/tests/ts/lsfd/mkfds-tcp +++ b/tests/ts/lsfd/mkfds-tcp @@ -22,6 +22,7 @@ ts_init "$*" ts_check_test_command "$TS_CMD_LSFD" ts_check_test_command "$TS_HELPER_MKFDS" +ts_skip_qemu_user ts_cd "$TS_OUTDIR" diff --git a/tests/ts/lsfd/mkfds-unix-in-netns b/tests/ts/lsfd/mkfds-unix-in-netns index a0e3bc887..ea22ae5d1 100755 --- a/tests/ts/lsfd/mkfds-unix-in-netns +++ b/tests/ts/lsfd/mkfds-unix-in-netns @@ -20,6 +20,7 @@ TS_DESC="UNIX sockets made in a differenct net namespace" . "$TS_TOPDIR"/functions.sh ts_init "$*" ts_skip_nonroot +ts_skip_qemu_user ts_check_test_command "$TS_CMD_LSFD" diff --git a/tests/ts/mount/fstab-broken b/tests/ts/mount/fstab-broken index 947e3af7a..c103ac915 100755 --- a/tests/ts/mount/fstab-broken +++ b/tests/ts/mount/fstab-broken @@ -26,6 +26,7 @@ ts_check_test_command "$TS_CMD_UMOUNT" ts_check_test_command "$TS_CMD_FINDMNT" ts_skip_nonroot +ts_skip_qemu_user # Let's use the same mountpoint for all subtests MNT=$TS_MOUNTPOINT diff --git a/tests/ts/mount/fstab-none b/tests/ts/mount/fstab-none index e2ed0af02..4be9d3f7d 100755 --- a/tests/ts/mount/fstab-none +++ b/tests/ts/mount/fstab-none @@ -11,6 +11,7 @@ ts_check_test_command "$TS_CMD_UMOUNT" ts_check_test_command "$TS_CMD_FINDMNT" ts_skip_nonroot +ts_skip_qemu_user ts_fstab_add "none" "$TS_MOUNTPOINT" "tmpfs" "rw,nosuid,nodev,relatime" diff --git a/tests/ts/mount/move b/tests/ts/mount/move index 9d2723a75..91080e55b 100755 --- a/tests/ts/mount/move +++ b/tests/ts/mount/move @@ -27,6 +27,7 @@ ts_check_test_command "$TS_CMD_FINDMNT" ts_check_test_command "$TS_CMD_MOUNTPOINT" ts_skip_nonroot +ts_skip_qemu_user function mount_and_check { # last arg must be an existing or to-be-mounted mountpoint |