Merge ~canonical-kernel-team/+git/overlay-shiftfs-tests:phlin/skip-zfs-tests into ~canonical-kernel-team/+git/overlay-shiftfs-tests:main

[Po-Hsu Lin]

ZFS is required by the shiftfs-lxd.sh test, but it is not supported
on realtime kernel (LP: #2017637)

[Francis Ginther (fginther)]

+1

review: Approve

diff --git a/lib/check-zfs-compatible.sh b/lib/check-zfs-compatible.sh
new file mode 100755
index 0000000..d2acf9c
--- /dev/null
+++ b/lib/check-zfs-compatible.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# ZFS is not support on realtime kernel (LP: #2017637)
+
+check_zfs_compatible() {
+    FLAVOUR=$(uname -r | awk -F'-' '{print $NF}')
+    if [[ "$FLAVOUR" == "realtime" ]]; then
+        echo "SKIPPING $(basename ${0}): Kernel is not ZFS compatible"
+        exit 0
+    fi
+}
diff --git a/tests/shiftfs-lxd.sh b/tests/shiftfs-lxd.sh
index a2a2a37..53e1d10 100755
--- a/tests/shiftfs-lxd.sh
+++ b/tests/shiftfs-lxd.sh
@@ -4,9 +4,12 @@
 ret=0
 
 . $(dirname ${0})/../lib/check-shiftfs-compatible.sh
+. $(dirname ${0})/../lib/check-zfs-compatible.sh
 
 # Check that this kernel supports shiftfs before running test
 check_shiftfs_compatible
+# Check that this kernel supports zfs before running test
+check_zfs_compatible
 
 . $(dirname ${0})/../lib/check-riscv64.sh