From 6743066875685c48f3f2f494564fe7e1dee747ba Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Mon, 4 Dec 2023 10:23:42 +0100 Subject: [PATCH] test: check if 'btrfs filesystem' supports 'mkswapfile' Instead of deny-listing the test on Ubuntu CI, so it gets enabled automagically once btrfs-progs is updated to a newer version there. --- test/TEST-83-BTRFS/deny-list-ubuntu-ci | 0 test/TEST-83-BTRFS/test.sh | 5 +++++ 2 files changed, 5 insertions(+) delete mode 100644 test/TEST-83-BTRFS/deny-list-ubuntu-ci diff --git a/test/TEST-83-BTRFS/deny-list-ubuntu-ci b/test/TEST-83-BTRFS/deny-list-ubuntu-ci deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/test/TEST-83-BTRFS/test.sh b/test/TEST-83-BTRFS/test.sh index 5c32c517e1..72d1244113 100755 --- a/test/TEST-83-BTRFS/test.sh +++ b/test/TEST-83-BTRFS/test.sh @@ -17,6 +17,11 @@ if ! command -v btrfs >/dev/null || ! command -v mkfs.btrfs >/dev/null; then exit 0 fi +if ! btrfs filesystem mkswapfile --help >/dev/null; then + echo "TEST: $TEST_DESCRIPTION [SKIPPED]: 'btrfs filesystem' doesn't support 'mkswapfile' subcommand" >&2 + exit 0 +fi + test_append_files() { install_btrfs image_install sync