From 7b29718dc4c2878d06920079ae332dfeb813d198 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thomas=20Wei=C3=9Fschuh?= Date: Mon, 10 Oct 2022 14:34:58 +0200 Subject: [PATCH] tests: disable nonfunctional tests under qemu user emulation --- tests/functions.sh | 6 ++++++ tests/ts/colcrt/functional | 1 + tests/ts/colcrt/regressions | 1 + tests/ts/column/table | 1 + tests/ts/kill/name_to_number | 3 +++ tests/ts/lsfd/column-ainodeclass | 1 + tests/ts/lsfd/column-name | 1 + tests/ts/lsfd/column-type | 1 + tests/ts/lsfd/mkfds-mapped-packet-socket | 1 + tests/ts/lsfd/mkfds-ro-block-device | 1 + tests/ts/lsfd/mkfds-tcp | 1 + tests/ts/lsfd/mkfds-unix-in-netns | 1 + tests/ts/mount/fstab-broken | 1 + tests/ts/mount/fstab-none | 1 + tests/ts/mount/move | 1 + 15 files changed, 22 insertions(+) diff --git a/tests/functions.sh b/tests/functions.sh index 216b66e64a..96915aee68 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 3e8cc3862c..f3c290a5f9 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 130ad9a5a4..c4ccb531cf 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 0ef53888e3..a9381aac5e 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 8a7f4bef05..955d861ecb 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 3db9189de6..2096c5b0c8 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 f87296c9af..3d56582607 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 d31b71254d..4b69ec751a 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 1efa75492a..abb0127384 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 86c1ba874b..2ba2a97d7f 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 129e74b0b8..f74333f644 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 a0e3bc8870..ea22ae5d1d 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 947e3af7ae..c103ac915d 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 e2ed0af024..4be9d3f7d0 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 9d2723a751..91080e55bb 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 -- 2.47.3