From: Thomas Weißschuh <thomas@t-8ch.de>
Date: Wed, 31 May 2023 15:31:01 +0000 (+0200)
Subject: tests: skip broken tests on docker
X-Git-Tag: v2.39.3~14^2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=6498439340a16e6acee54987df016c6b7928b17a;p=thirdparty%2Futil-linux.git

tests: skip broken tests on docker

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
(cherry picked from commit d53284bb1e40f19ac065e52ff9df97d2caf60259)
---

diff --git a/tests/ts/hwclock/show b/tests/ts/hwclock/show
index 9cab474609..d8cdc8ee74 100755
--- a/tests/ts/hwclock/show
+++ b/tests/ts/hwclock/show
@@ -26,6 +26,7 @@ ts_check_test_command "$TS_CMD_HWCLOCK"
 
 ts_skip_nonroot
 ts_skip_qemu_user
+ts_skip_docker
 
 # RTC interrupts are sometimes broken on GitHub Actions
 if ts_is_virt "microsoft"; then
diff --git a/tests/ts/lsfd/mkfds-mapped-packet-socket b/tests/ts/lsfd/mkfds-mapped-packet-socket
index 6844e75e5a..a1fb68f985 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_docker
 
 . "$TS_SELF"/lsfd-functions.bash
 
diff --git a/tests/ts/lsfd/mkfds-netns b/tests/ts/lsfd/mkfds-netns
index 24e9265619..cd110f6cca 100755
--- a/tests/ts/lsfd/mkfds-netns
+++ b/tests/ts/lsfd/mkfds-netns
@@ -20,6 +20,7 @@ TS_DESC="netns associated with a fd"
 . "$TS_TOPDIR"/functions.sh
 ts_init "$*"
 ts_skip_nonroot
+ts_skip_docker
 
 . "$TS_SELF/lsfd-functions.bash"
 ts_check_test_command "$TS_CMD_LSFD"
diff --git a/tests/ts/lsfd/mkfds-raw6 b/tests/ts/lsfd/mkfds-raw6
index d758aad241..0b82fff330 100755
--- a/tests/ts/lsfd/mkfds-raw6
+++ b/tests/ts/lsfd/mkfds-raw6
@@ -25,6 +25,7 @@ ts_skip_nonroot
 ts_check_test_command "$TS_CMD_LSFD"
 ts_check_test_command "$TS_HELPER_MKFDS"
 ts_check_native_byteorder
+ts_skip_docker
 
 ts_cd "$TS_OUTDIR"
 
diff --git a/tests/ts/lsfd/mkfds-ro-block-device b/tests/ts/lsfd/mkfds-ro-block-device
index e5d108d8c2..ad5a492045 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_docker
 
 # losetup cannot find an unused loop device.
 ts_skip_qemu_user
diff --git a/tests/ts/lsfd/mkfds-tcp6 b/tests/ts/lsfd/mkfds-tcp6
index 5f196daafd..7368bfa9fe 100755
--- a/tests/ts/lsfd/mkfds-tcp6
+++ b/tests/ts/lsfd/mkfds-tcp6
@@ -23,6 +23,7 @@ ts_init "$*"
 ts_check_test_command "$TS_CMD_LSFD"
 ts_check_test_command "$TS_HELPER_MKFDS"
 ts_check_native_byteorder
+ts_skip_docker
 
 ts_cd "$TS_OUTDIR"
 
diff --git a/tests/ts/lsfd/mkfds-udp6 b/tests/ts/lsfd/mkfds-udp6
index cd8dc00a4a..75381ba380 100755
--- a/tests/ts/lsfd/mkfds-udp6
+++ b/tests/ts/lsfd/mkfds-udp6
@@ -23,6 +23,7 @@ ts_init "$*"
 ts_check_test_command "$TS_CMD_LSFD"
 ts_check_test_command "$TS_HELPER_MKFDS"
 ts_check_native_byteorder
+ts_skip_docker
 
 ts_cd "$TS_OUTDIR"
 
diff --git a/tests/ts/lsfd/option-inet b/tests/ts/lsfd/option-inet
index 21e66f7004..011a9b3a55 100755
--- a/tests/ts/lsfd/option-inet
+++ b/tests/ts/lsfd/option-inet
@@ -20,6 +20,7 @@ TS_DESC="--inet option"
 . "$TS_TOPDIR"/functions.sh
 ts_init "$*"
 ts_skip_qemu_user
+ts_skip_docker
 
 ts_check_test_command "$TS_CMD_LSFD"
 ts_check_test_command "$TS_HELPER_MKFDS"
diff --git a/tests/ts/mount/fstab-bind b/tests/ts/mount/fstab-bind
index 603a8d890b..2c799df789 100755
--- a/tests/ts/mount/fstab-bind
+++ b/tests/ts/mount/fstab-bind
@@ -11,6 +11,7 @@ ts_check_test_command "$TS_CMD_UMOUNT"
 ts_check_test_command "$TS_CMD_FINDMNT"
 
 ts_skip_nonroot
+ts_skip_docker
 
 MY_SOURCE="${TS_MOUNTPOINT}-src"
 
diff --git a/tests/ts/mount/fstab-broken b/tests/ts/mount/fstab-broken
index 131d5c1d75..19edc5fe31 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_docker
 
 # 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 8d3e052ac1..6a4d05b62e 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_docker
 
 ts_fstab_add "none" "$TS_MOUNTPOINT" "tmpfs" "rw,nosuid,nodev,relatime"
 
diff --git a/tests/ts/mount/move b/tests/ts/mount/move
index cebcac7aa9..26b8f3d2a5 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_docker
 
 function mount_and_check {
 	# last arg must be an existing or to-be-mounted mountpoint