From 5ae6ff12581f214c6c13f36a309da5042a9173c5 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Tue, 23 Apr 2024 23:20:44 +0200 Subject: [PATCH] TEST-50-DISSECT: Skip mutable sysext tests on virtiofs virtiofs cannot be used as the upper fs for overlayfs, so skip all the sysext mutable tests that would try to use virtiofs as the upper fs. --- test/units/testsuite-50.sysext.sh | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/test/units/testsuite-50.sysext.sh b/test/units/testsuite-50.sysext.sh index 8cfa0a485c2..3bc88999f80 100755 --- a/test/units/testsuite-50.sysext.sh +++ b/test/units/testsuite-50.sysext.sh @@ -4,6 +4,7 @@ set -eux set -o pipefail FAKE_ROOTS_DIR="$(mktemp -d --tmpdir="" fake-roots-XXX)" +FSTYPE=$(stat --file-system --format "%T" /usr) shopt -s nullglob @@ -370,6 +371,8 @@ fake_root=${roots_dir:+"$roots_dir/simple-mutable-with-read-only-hierarchy"} hierarchy=/opt extension_data_dir="$fake_root/var/lib/extensions.mutable$hierarchy" +[[ "$FSTYPE" == "fuseblk" ]] && exit 0 + prepare_root "$fake_root" "$hierarchy" prepare_extension_image "$fake_root" "$hierarchy" prepare_extension_mutable_dir "$extension_data_dir" @@ -394,6 +397,8 @@ fake_root=${roots_dir:+"$roots_dir/simple-mutable-with-missing-hierarchy"} hierarchy=/opt extension_data_dir="$fake_root/var/lib/extensions.mutable$hierarchy" +[[ "$FSTYPE" == "fuseblk" ]] && exit 0 + move_existing_hierarchy_aside "$fake_root" "$hierarchy" prepare_root "$fake_root" "$hierarchy" rmdir "$fake_root/$hierarchy" @@ -418,6 +423,8 @@ fake_root=${roots_dir:+"$roots_dir/simple-mutable-with-empty-hierarchy"} hierarchy=/opt extension_data_dir="$fake_root/var/lib/extensions.mutable$hierarchy" +[[ "$FSTYPE" == "fuseblk" ]] && exit 0 + move_existing_hierarchy_aside "$fake_root" "$hierarchy" prepare_root "$fake_root" "$hierarchy" prepare_extension_image "$fake_root" "$hierarchy" @@ -444,6 +451,8 @@ hierarchy=/opt extension_data_dir="$fake_root/var/lib/extensions.mutable$hierarchy" extension_real_dir="$fake_root/upperdir" +[[ "$FSTYPE" == "fuseblk" ]] && exit 0 + prepare_root "$fake_root" "$hierarchy" prepare_extension_image "$fake_root" "$hierarchy" prepare_extension_mutable_dir "$extension_real_dir" @@ -473,6 +482,8 @@ hierarchy=/opt extension_data_dir="$fake_root/var/lib/extensions.mutable$hierarchy" extension_real_dir="$fake_root$hierarchy" +[[ "$FSTYPE" == "fuseblk" ]] && exit 0 + prepare_root "$fake_root" "$hierarchy" prepare_extension_image "$fake_root" "$hierarchy" prepare_extension_mutable_dir "$extension_real_dir" @@ -582,6 +593,8 @@ hierarchy=/opt extension_data_dir="$fake_root/var/lib/extensions.mutable$hierarchy" extension_data_dir_usr="$fake_root/var/lib/extensions.mutable/usr" +[[ "$FSTYPE" == "fuseblk" ]] && exit 0 + prepare_root "$fake_root" "$hierarchy" prepare_extension_image "$fake_root" "$hierarchy" prepare_read_only_hierarchy "$fake_root" "$hierarchy" @@ -635,6 +648,8 @@ hierarchy=/opt extension_data_dir="$fake_root/var/lib/extensions.mutable$hierarchy" extension_data_dir_usr="$fake_root/var/lib/extensions.mutable/usr" +[[ "$FSTYPE" == "fuseblk" ]] && exit 0 + prepare_root "$fake_root" "$hierarchy" prepare_extension_image "$fake_root" "$hierarchy" prepare_read_only_hierarchy "$fake_root" "$hierarchy" @@ -687,6 +702,8 @@ fake_root=${roots_dir:+"$roots_dir/auto-mutable-env-var"} hierarchy=/opt extension_data_dir="$fake_root/var/lib/extensions.mutable$hierarchy" +[[ "$FSTYPE" == "fuseblk" ]] && exit 0 + prepare_root "$fake_root" "$hierarchy" prepare_extension_image "$fake_root" "$hierarchy" prepare_extension_mutable_dir "$extension_data_dir" @@ -774,6 +791,8 @@ fake_root=${roots_dir:+"$roots_dir/ephemeral"} hierarchy=/opt extension_data_dir="$fake_root/var/lib/extensions.mutable$hierarchy" +[[ "$FSTYPE" == "fuseblk" ]] && exit 0 + prepare_root "$fake_root" "$hierarchy" prepare_extension_image "$fake_root" "$hierarchy" prepare_extension_mutable_dir "$extension_data_dir" @@ -798,6 +817,8 @@ fake_root=${roots_dir:+"$roots_dir/ephemeral-env-var"} hierarchy=/opt extension_data_dir="$fake_root/var/lib/extensions.mutable$hierarchy" +[[ "$FSTYPE" == "fuseblk" ]] && exit 0 + prepare_root "$fake_root" "$hierarchy" prepare_extension_image "$fake_root" "$hierarchy" prepare_extension_mutable_dir "$extension_data_dir" @@ -822,6 +843,8 @@ fake_root=${roots_dir:+"$roots_dir/ephemeral-import"} hierarchy=/opt extension_data_dir="$fake_root/var/lib/extensions.mutable$hierarchy" +[[ "$FSTYPE" == "fuseblk" ]] && exit 0 + prepare_root "$fake_root" "$hierarchy" prepare_extension_image "$fake_root" "$hierarchy" prepare_extension_mutable_dir "$extension_data_dir" @@ -846,6 +869,8 @@ fake_root=${roots_dir:+"$roots_dir/ephemeral-import-env-var"} hierarchy=/opt extension_data_dir="$fake_root/var/lib/extensions.mutable$hierarchy" +[[ "$FSTYPE" == "fuseblk" ]] && exit 0 + prepare_root "$fake_root" "$hierarchy" prepare_extension_image "$fake_root" "$hierarchy" prepare_extension_mutable_dir "$extension_data_dir" @@ -871,6 +896,8 @@ hierarchy=/opt extension_data_dir="$fake_root/var/lib/extensions.mutable$hierarchy" extension_real_dir="$fake_root$hierarchy" +[[ "$FSTYPE" == "fuseblk" ]] && exit 0 + prepare_root "$fake_root" "$hierarchy" prepare_extension_image "$fake_root" "$hierarchy" prepare_extension_mutable_dir "$extension_real_dir" @@ -890,6 +917,8 @@ hierarchy=/opt extension_data_dir="$fake_root/var/lib/extensions.mutable$hierarchy" extension_real_dir="$fake_root$hierarchy" +[[ "$FSTYPE" == "fuseblk" ]] && exit 0 + prepare_root "$fake_root" "$hierarchy" prepare_extension_image "$fake_root" "$hierarchy" prepare_extension_mutable_dir "$extension_real_dir" @@ -910,6 +939,8 @@ for mutable_mode in no yes ephemeral; do hierarchy=/opt extension_data_dir="$fake_root/var/lib/extensions.mutable$hierarchy" + [[ "$FSTYPE" == "fuseblk" ]] && exit 0 + prepare_root "$fake_root" "$hierarchy" prepare_extension_image "$fake_root" "$hierarchy" prepare_extension_mutable_dir "$extension_data_dir"