|
 |
a56a5e |
From 1e03d8eb646938732e66e0babf93c93f1b466e44 Mon Sep 17 00:00:00 2001
|
|
|
a56a5e |
From: Harald Hoyer <harald@redhat.com>
|
|
|
a56a5e |
Date: Tue, 29 Jul 2014 16:27:35 +0200
|
|
|
a56a5e |
Subject: [PATCH] testsuite mods for kvm nested in kvm
|
|
|
a56a5e |
|
|
|
a56a5e |
---
|
|
|
a56a5e |
test/TEST-01-BASIC/test.sh | 1 +
|
|
|
a56a5e |
test/TEST-02-SYSTEMD/test.sh | 2 +-
|
|
|
a56a5e |
test/TEST-03-USR-MOUNT/test.sh | 9 ++++-----
|
|
|
a56a5e |
test/TEST-12-RAID-DEG/test.sh | 2 +-
|
|
|
a56a5e |
test/TEST-14-IMSM/test.sh | 2 +-
|
|
|
a56a5e |
5 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
a56a5e |
|
|
|
a56a5e |
diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
|
|
|
1755ca |
index f857fd4c..5ee6d234 100755
|
|
|
a56a5e |
--- a/test/TEST-01-BASIC/test.sh
|
|
|
a56a5e |
+++ b/test/TEST-01-BASIC/test.sh
|
|
|
a56a5e |
@@ -87,6 +87,7 @@ test_setup() {
|
|
|
a56a5e |
)
|
|
|
a56a5e |
sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
|
|
|
a56a5e |
-a "debug watchdog" \
|
|
|
a56a5e |
+ -o "plymouth" \
|
|
|
a56a5e |
-d "piix ide-gd_mod ata_piix ext3 sd_mod i6300esb ib700wdt" \
|
|
|
a56a5e |
-f $TESTDIR/initramfs.testing $KVERSION || return 1
|
|
|
a56a5e |
|
|
|
a56a5e |
diff --git a/test/TEST-02-SYSTEMD/test.sh b/test/TEST-02-SYSTEMD/test.sh
|
|
|
1755ca |
index cc9da27f..2ccf8e69 100755
|
|
|
a56a5e |
--- a/test/TEST-02-SYSTEMD/test.sh
|
|
|
a56a5e |
+++ b/test/TEST-02-SYSTEMD/test.sh
|
|
|
a56a5e |
@@ -83,7 +83,7 @@ test_setup() {
|
|
|
a56a5e |
)
|
|
|
a56a5e |
sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
|
|
|
a56a5e |
-a "debug systemd" \
|
|
|
a56a5e |
- -o "network" \
|
|
|
a56a5e |
+ -o "network plymouth" \
|
|
|
a56a5e |
-d "piix ide-gd_mod ata_piix ext3 sd_mod" \
|
|
|
a56a5e |
-f $TESTDIR/initramfs.testing $KVERSION || return 1
|
|
|
a56a5e |
|
|
|
a56a5e |
diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh
|
|
|
1755ca |
index b3d709eb..ef74d402 100755
|
|
|
a56a5e |
--- a/test/TEST-03-USR-MOUNT/test.sh
|
|
|
a56a5e |
+++ b/test/TEST-03-USR-MOUNT/test.sh
|
|
|
a56a5e |
@@ -5,7 +5,7 @@ TEST_DESCRIPTION="root filesystem on a btrfs filesystem with /usr subvolume"
|
|
|
a56a5e |
KVERSION=${KVERSION-$(uname -r)}
|
|
|
a56a5e |
|
|
|
a56a5e |
# Uncomment this to debug failures
|
|
|
a56a5e |
-#DEBUGFAIL="rd.shell rd.break"
|
|
|
a56a5e |
+#DEBUGFAIL="rd.shell rd.break=cmdline"
|
|
|
a56a5e |
|
|
|
a56a5e |
client_run() {
|
|
|
a56a5e |
local test_name="$1"; shift
|
|
|
a56a5e |
@@ -20,8 +20,7 @@ client_run() {
|
|
|
a56a5e |
-hdc $TESTDIR/result \
|
|
|
a56a5e |
-m 256M -smp 2 -nographic \
|
|
|
a56a5e |
-net none -kernel /boot/vmlinuz-$KVERSION \
|
|
|
a56a5e |
- -watchdog i6300esb -watchdog-action poweroff \
|
|
|
a56a5e |
- -append "root=LABEL=dracut $client_opts quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL" \
|
|
|
a56a5e |
+ -append "root=LABEL=dracut $client_opts rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" \
|
|
|
a56a5e |
-initrd $TESTDIR/initramfs.testing
|
|
|
a56a5e |
|
|
|
a56a5e |
if (($? != 0)); then
|
|
|
a56a5e |
@@ -121,8 +120,8 @@ test_setup() {
|
|
|
a56a5e |
inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
|
|
|
a56a5e |
)
|
|
|
a56a5e |
sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
|
|
|
a56a5e |
- -a "debug watchdog" \
|
|
|
a56a5e |
- -o "network" \
|
|
|
a56a5e |
+ -a "debug" \
|
|
|
a56a5e |
+ -o "network plymouth" \
|
|
|
a56a5e |
-d "piix ide-gd_mod ata_piix btrfs sd_mod i6300esb ib700wdt" \
|
|
|
a56a5e |
-f $TESTDIR/initramfs.testing $KVERSION || return 1
|
|
|
a56a5e |
|
|
|
a56a5e |
diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh
|
|
|
1755ca |
index dfcf3dc1..26316210 100755
|
|
|
a56a5e |
--- a/test/TEST-12-RAID-DEG/test.sh
|
|
|
a56a5e |
+++ b/test/TEST-12-RAID-DEG/test.sh
|
|
|
a56a5e |
@@ -19,7 +19,7 @@ client_run() {
|
|
|
a56a5e |
-hdc $TESTDIR/disk2.img.new \
|
|
|
a56a5e |
-hdd $TESTDIR/disk3.img.new \
|
|
|
a56a5e |
-net none -kernel /boot/vmlinuz-$KVERSION \
|
|
|
a56a5e |
- -append "$* root=LABEL=root rw rd.retry=10 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL " \
|
|
|
a56a5e |
+ -append "$* root=LABEL=root rw rd.retry=20 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL " \
|
|
|
a56a5e |
-initrd $TESTDIR/initramfs.testing
|
|
|
a56a5e |
if ! grep -F -m 1 -q dracut-root-block-success $TESTDIR/root.ext2; then
|
|
|
a56a5e |
echo "CLIENT TEST END: $@ [FAIL]"
|
|
|
a56a5e |
diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh
|
|
|
1755ca |
index 9353a924..532c3489 100755
|
|
|
a56a5e |
--- a/test/TEST-14-IMSM/test.sh
|
|
|
a56a5e |
+++ b/test/TEST-14-IMSM/test.sh
|
|
|
a56a5e |
@@ -15,7 +15,7 @@ client_run() {
|
|
|
a56a5e |
-hdc $TESTDIR/disk2 \
|
|
|
a56a5e |
-m 256M -nographic \
|
|
|
a56a5e |
-net none -kernel /boot/vmlinuz-$KVERSION \
|
|
|
a56a5e |
- -append "$* root=LABEL=root rw debug rd.retry=5 rd.debug console=ttyS0,115200n81 selinux=0 rd.info $DEBUGFAIL" \
|
|
|
a56a5e |
+ -append "$* root=LABEL=root rw debug rd.retry=20 rd.debug console=ttyS0,115200n81 selinux=0 rd.info $DEBUGFAIL" \
|
|
|
a56a5e |
-initrd $TESTDIR/initramfs.testing
|
|
|
a56a5e |
if ! grep -F -m 1 -q dracut-root-block-success $TESTDIR/root.ext2; then
|
|
|
a56a5e |
echo "CLIENT TEST END: $@ [FAIL]"
|