test: add "failme" parameter for failing tests

diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh
index 43592532922ca9ddc24ae1d1f707cec7cb0f7a88..4d88d794b383ef4b7c7f345f48e982d656ed00d5 100755 (executable)
--- a/test/TEST-12-RAID-DEG/test.sh
+++ b/test/TEST-12-RAID-DEG/test.sh
@@ -30,21 +30,21 @@ test_run() {
     
     client_run rd_NO_MDADMCONF || return 1
 
-    client_run rd_NO_LVM && return 1
+    client_run rd_NO_LVM failme && return 1
 
-    client_run rd_LVM_VG=failme && return 1
+    client_run rd_LVM_VG=failme failme && return 1
 
     client_run rd_LVM_VG=dracut || return 1
 
-    client_run rd_LVM_VG=dummy1 rd_LVM_VG=dracut rd_LVM_VG=dummy2 || return 1
+    client_run rd_LVM_VG=dummy1 rd_LVM_VG=dracut rd_LVM_VG=dummy2 rd_NO_LVMCONF || return 1
 
-    client_run rd_MD_UUID=failme rd_NO_MDADMCONF && return 1
+    client_run rd_MD_UUID=failme rd_NO_MDADMCONF failme && return 1
 
-    client_run rd_NO_MD && return 1
+    client_run rd_NO_MD failme && return 1
 
     client_run rd_MD_UUID=$MD_UUID rd_NO_MDADMCONF || return 1
 
-    client_run rd_MD_UUID=dummy1 rd_MD_UUID=$MD_UUID rd_MD_UUID=dummy2 rd_NO_MDADMCONF|| return 1
+    client_run rd_MD_UUID=dummy1 rd_MD_UUID=$MD_UUID rd_MD_UUID=dummy2 rd_NO_MDADMCONF || return 1
 
     return 0
 }

diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh
index be33ac325f8be11891ac659a89fcd752d17f3fa7..d86afc2e8ea05683a78260447bb910ca6d2149b9 100755 (executable)
--- a/test/TEST-14-IMSM/test.sh
+++ b/test/TEST-14-IMSM/test.sh
@@ -29,8 +29,8 @@ test_run() {
     # This test succeeds, because the mirror parts are found without
     # assembling the mirror itsself, which is what we want
     client_run rd_NO_DM rd_NO_MDIMSM rd_NO_MDADMCONF || return 1
-    client_run rd_NO_MD rd_NO_MDIMSM  && return 1
-    client_run rd_NO_MD && return 1
+    client_run rd_NO_MD rd_NO_MDIMSM failme && return 1
+    client_run rd_NO_MD failme && return 1
    return 0
 }
 

diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
index 8072cf0b00ee24db58fcb1a4a276d7474546f464..e246ed026b6605cb95267a0cae93405786bfded2 100755 (executable)
--- a/test/TEST-20-NFS/test.sh
+++ b/test/TEST-20-NFS/test.sh
@@ -133,7 +133,7 @@ test_nfsv3() {
 
     # This test must fail: nfsroot= requires root=/dev/nfs
     client_test "NFSv3 Invalid root=dhcp nfsroot=/nfs/client" 52:54:00:12:34:04 \
-       "root=dhcp nfsroot=/nfs/client" 192.168.50.1 -wsize=4096 && return 1
+       "root=dhcp nfsroot=/nfs/client failme" 192.168.50.1 -wsize=4096 && return 1
 
     client_test "NFSv3 root=dhcp DHCP path,options" \
        52:54:00:12:34:05 "root=dhcp" 192.168.50.1 wsize=4096 || return 1