testsuite mods for kvm nested in kvm

diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
index f857fd4ca5e08f4c4bdd56a581cd0b0e44da0936..5ee6d234869f083135f80f3f565dc18979d02f7d 100755 (executable)
--- a/test/TEST-01-BASIC/test.sh
+++ b/test/TEST-01-BASIC/test.sh
@@ -87,6 +87,7 @@ test_setup() {
     )
     sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
        -a "debug watchdog" \
+        -o "plymouth" \
        -d "piix ide-gd_mod ata_piix ext3 sd_mod i6300esb ib700wdt" \
        -f $TESTDIR/initramfs.testing $KVERSION || return 1
 

diff --git a/test/TEST-02-SYSTEMD/test.sh b/test/TEST-02-SYSTEMD/test.sh
index cc9da27f998ad3226288463346dacc49758c32d2..2ccf8e69397e57c5694783e4fcac35e2df69d873 100755 (executable)
--- a/test/TEST-02-SYSTEMD/test.sh
+++ b/test/TEST-02-SYSTEMD/test.sh
@@ -83,7 +83,7 @@ test_setup() {
     )
     sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
        -a "debug systemd" \
-       -o "network" \
+       -o "network plymouth" \
        -d "piix ide-gd_mod ata_piix ext3 sd_mod" \
        -f $TESTDIR/initramfs.testing $KVERSION || return 1
 

diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh
index b3d709eb05c6ae41bf103258f5fc4642f0661eae..ef74d402f75ad8936e8d80a0635ddb5c37fe5568 100755 (executable)
--- a/test/TEST-03-USR-MOUNT/test.sh
+++ b/test/TEST-03-USR-MOUNT/test.sh
@@ -5,7 +5,7 @@ TEST_DESCRIPTION="root filesystem on a btrfs filesystem with /usr subvolume"
 KVERSION=${KVERSION-$(uname -r)}
 
 # Uncomment this to debug failures
-#DEBUGFAIL="rd.shell rd.break"
+#DEBUGFAIL="rd.shell rd.break=cmdline"
 
 client_run() {
     local test_name="$1"; shift
@@ -20,8 +20,7 @@ client_run() {
        -hdc $TESTDIR/result \
        -m 256M -smp 2 -nographic \
        -net none -kernel /boot/vmlinuz-$KVERSION \
-       -watchdog i6300esb -watchdog-action poweroff \
-       -append "root=LABEL=dracut $client_opts quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL" \
+       -append "root=LABEL=dracut $client_opts rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" \
        -initrd $TESTDIR/initramfs.testing
 
     if (($? != 0)); then
@@ -121,8 +120,8 @@ test_setup() {
        inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
     )
     sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
-       -a "debug watchdog" \
-        -o "network" \
+       -a "debug" \
+        -o "network plymouth" \
        -d "piix ide-gd_mod ata_piix btrfs sd_mod i6300esb ib700wdt" \
        -f $TESTDIR/initramfs.testing $KVERSION || return 1
 

diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh
index dfcf3dc1b8e4a243a0ccc1d0e46e9ae11e747896..2631621043c0cb41c281879c815cf76063e82b2e 100755 (executable)
--- a/test/TEST-12-RAID-DEG/test.sh
+++ b/test/TEST-12-RAID-DEG/test.sh
@@ -19,7 +19,7 @@ client_run() {
        -hdc $TESTDIR/disk2.img.new \
        -hdd $TESTDIR/disk3.img.new \
        -net none -kernel /boot/vmlinuz-$KVERSION \
-       -append "$* root=LABEL=root rw rd.retry=10 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL " \
+       -append "$* root=LABEL=root rw rd.retry=20 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL " \
        -initrd $TESTDIR/initramfs.testing
     if ! grep -F -m 1 -q dracut-root-block-success $TESTDIR/root.ext2; then
        echo "CLIENT TEST END: $@ [FAIL]"

diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh
index 9353a924fc61e42144fe1a4d05903b5b16a1bf35..532c3489af77a603e8d2df5b6ea0b1209a94e3db 100755 (executable)
--- a/test/TEST-14-IMSM/test.sh
+++ b/test/TEST-14-IMSM/test.sh
@@ -15,7 +15,7 @@ client_run() {
        -hdc $TESTDIR/disk2 \
        -m 256M -nographic \
        -net none -kernel /boot/vmlinuz-$KVERSION \
-       -append "$* root=LABEL=root rw debug rd.retry=5 rd.debug console=ttyS0,115200n81 selinux=0 rd.info $DEBUGFAIL" \
+       -append "$* root=LABEL=root rw debug rd.retry=20 rd.debug console=ttyS0,115200n81 selinux=0 rd.info $DEBUGFAIL" \
        -initrd $TESTDIR/initramfs.testing
     if ! grep -F -m 1 -q dracut-root-block-success $TESTDIR/root.ext2; then
        echo "CLIENT TEST END: $@ [FAIL]"