test: move test condition to test_check

This enables skipping the test instead of failing it.

diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh
index b540fe0395b6beb955e89e70cf8e6fb2ed2977d4..a6aa17330377e455d0282f3b35334c5b5c0f919a 100755 (executable)
--- a/test/TEST-30-ISCSI/test.sh
+++ b/test/TEST-30-ISCSI/test.sh
@@ -125,12 +125,14 @@ test_run() {
     return $ret
 }
 
-test_setup() {
+test_check() {
     if ! command -v tgtd &> /dev/null || ! command -v tgtadm &> /dev/null; then
         echo "Need tgtd and tgtadm from scsi-target-utils"
         return 1
     fi
+}
 
+test_setup() {
     kernel=$KVERSION
     # Create what will eventually be our root filesystem onto an overlay
     rm -rf -- "$TESTDIR"/overlay

diff --git a/test/TEST-35-ISCSI-MULTI/test.sh b/test/TEST-35-ISCSI-MULTI/test.sh
index 8979f59a9749afc01b574e00b4503ecc165429dc..19ee07557ad9ef5be5b150b09c8a573702090e88 100755 (executable)
--- a/test/TEST-35-ISCSI-MULTI/test.sh
+++ b/test/TEST-35-ISCSI-MULTI/test.sh
@@ -137,12 +137,14 @@ test_run() {
     return $ret
 }
 
-test_setup() {
+test_check() {
     if ! command -v tgtd &> /dev/null || ! command -v tgtadm &> /dev/null; then
         echo "Need tgtd and tgtadm from scsi-target-utils"
         return 1
     fi
+}
 
+test_setup() {
     kernel=$KVERSION
     # Create what will eventually be our root filesystem onto an overlay
     rm -rf -- "$TESTDIR"/overlay