From: Jo Zzsi <jozzsicsataban@gmail.com>
Date: Sun, 10 Nov 2024 11:34:24 +0000 (-0500)
Subject: test: improve precondition checking
X-Git-Tag: 106~222
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60f30ef260775d9be7667e49a53643cd652a49cc;p=thirdparty%2Fdracut-ng.git

test: improve precondition checking

These changes allow gentoo:slim CI container to not fail.
---

diff --git a/test/TEST-12-UEFI/test.sh b/test/TEST-12-UEFI/test.sh
index 9ba7a9636..700715a44 100755
--- a/test/TEST-12-UEFI/test.sh
+++ b/test/TEST-12-UEFI/test.sh
@@ -4,6 +4,11 @@
 TEST_DESCRIPTION="UEFI boot"
 
 test_check() {
+    if ! type -p mksquashfs &> /dev/null; then
+        echo "Test needs mksquashfs... Skipping"
+        return 1
+    fi
+
     [[ -n "$(ovmf_code)" ]]
 }
 
diff --git a/test/TEST-20-RAID/test.sh b/test/TEST-20-RAID/test.sh
index 2c34dae99..3e412603d 100755
--- a/test/TEST-20-RAID/test.sh
+++ b/test/TEST-20-RAID/test.sh
@@ -7,6 +7,11 @@ test_check() {
         echo "Test needs cryptsetup for crypt module... Skipping"
         return 1
     fi
+
+    if ! type -p mdraid &> /dev/null; then
+        echo "Test needs mdraid for mdraid module ... Skipping"
+        return 1
+    fi
 }
 
 # Uncomment this to debug failures
diff --git a/test/TEST-21-LVM/test.sh b/test/TEST-21-LVM/test.sh
index 5b13e27ff..a7a6094cf 100755
--- a/test/TEST-21-LVM/test.sh
+++ b/test/TEST-21-LVM/test.sh
@@ -11,6 +11,11 @@ test_check() {
         echo "Test needs lvm for lvm module... Skipping"
         return 1
     fi
+
+    if ! type -p mdraid &> /dev/null; then
+        echo "Test needs mdraid for mdraid module ... Skipping"
+        return 1
+    fi
 }
 
 test_run() {
diff --git a/test/TEST-22-RAID-DEG/test.sh b/test/TEST-22-RAID-DEG/test.sh
index 7d578b0d7..82b51f119 100755
--- a/test/TEST-22-RAID-DEG/test.sh
+++ b/test/TEST-22-RAID-DEG/test.sh
@@ -13,6 +13,11 @@ test_check() {
         echo "Test needs cryptsetup for crypt module... Skipping"
         return 1
     fi
+
+    if ! type -p mdraid &> /dev/null; then
+        echo "Test needs mdraid for mdraid module ... Skipping"
+        return 1
+    fi
 }
 
 client_run() {
diff --git a/test/TEST-25-LVM-THIN/test.sh b/test/TEST-25-LVM-THIN/test.sh
index 61ae5d87d..32b4a0d6c 100755
--- a/test/TEST-25-LVM-THIN/test.sh
+++ b/test/TEST-25-LVM-THIN/test.sh
@@ -10,6 +10,11 @@ test_check() {
         echo "Test needs lvm for lvm module... Skipping"
         return 1
     fi
+
+    if ! type -p mdraid &> /dev/null; then
+        echo "Test needs mdraid for mdraid module ... Skipping"
+        return 1
+    fi
 }
 
 test_run() {
diff --git a/test/TEST-26-ENC-RAID-LVM/test.sh b/test/TEST-26-ENC-RAID-LVM/test.sh
index 3861c8721..7a351ec1b 100755
--- a/test/TEST-26-ENC-RAID-LVM/test.sh
+++ b/test/TEST-26-ENC-RAID-LVM/test.sh
@@ -12,6 +12,11 @@ test_check() {
         echo "Test needs cryptsetup for crypt module... Skipping"
         return 1
     fi
+
+    if ! type -p mdraid &> /dev/null; then
+        echo "Test needs mdraid for mdraid module ... Skipping"
+        return 1
+    fi
 }
 
 test_run() {
diff --git a/test/TEST-30-DMSQUASH/test.sh b/test/TEST-30-DMSQUASH/test.sh
index a6c91e0ef..d7c39b577 100755
--- a/test/TEST-30-DMSQUASH/test.sh
+++ b/test/TEST-30-DMSQUASH/test.sh
@@ -8,7 +8,7 @@ TEST_DESCRIPTION="live root on a squash filesystem"
 
 test_check() {
     if ! type -p mksquashfs &> /dev/null; then
-        echo "Test needs mksquashfs for crypt module... Skipping"
+        echo "Test needs mksquashfs... Skipping"
         return 1
     fi
 }