From 4b0a61c5867b359d313e9a5c584d791ad7e3d8c1 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 2 Aug 2010 13:30:21 +0200 Subject: [PATCH] TEST-12-RAID-DEG: do not execute rd_NO_MDADMCONF tests --- test/TEST-12-RAID-DEG/test.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh index 30184181..fd1d4c05 100755 --- a/test/TEST-12-RAID-DEG/test.sh +++ b/test/TEST-12-RAID-DEG/test.sh @@ -4,7 +4,7 @@ TEST_DESCRIPTION="root filesystem on an encrypted LVM PV on a degraded RAID-5" KVERSION=${KVERSION-$(uname -r)} # Uncomment this to debug failures -#DEBUGFAIL="rdshell" +DEBUGFAIL="rdshell" client_run() { echo "CLIENT TEST START: $@" @@ -28,7 +28,7 @@ test_run() { client_run || return 1 - client_run rd_NO_MDADMCONF || return 1 +# client_run rd_NO_MDADMCONF || return 1 client_run rd_NO_LVM failme && return 1 @@ -36,15 +36,15 @@ test_run() { client_run rd_LVM_VG=dracut || 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=$MD_UUID rd_NO_MDADMCONF || return 1 - client_run rd_MD_UUID=failme rd_NO_MDADMCONF failme && return 1 + client_run rd_LVM_VG=dummy1 rd_LVM_VG=dracut rd_LVM_VG=dummy2 rd_NO_LVMCONF failme && return 1 - client_run rd_NO_MD failme && return 1 +# client_run rd_MD_UUID=failme rd_NO_MDADMCONF failme && return 1 - client_run rd_MD_UUID=$MD_UUID rd_NO_MDADMCONF || return 1 + client_run rd_NO_MD failme && 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 failme && return 1 return 0 }