diff options
author | Harald Hoyer <harald@redhat.com> | 2009-10-06 18:39:40 +0200 |
---|---|---|
committer | Harald Hoyer <harald@redhat.com> | 2009-10-06 19:09:22 +0200 |
commit | 40ef4325d947d2d5f8219e728082fb337e8f46cf (patch) | |
tree | 4ac504e5ac4a83298dc75e5707fc3353ee3e3760 | |
parent | 16da29bf9d35e75d82ad6201df0206e78ba636f1 (diff) |
test: run all tests with rdinitdebug by default
-rwxr-xr-x | test/TEST-10-RAID/test.sh | 4 | ||||
-rwxr-xr-x | test/TEST-11-LVM/test.sh | 4 | ||||
-rwxr-xr-x | test/TEST-12-RAID-DEG/test.sh | 4 | ||||
-rwxr-xr-x | test/TEST-13-ENC-RAID-LVM/test.sh | 4 | ||||
-rwxr-xr-x | test/TEST-14-IMSM/test.sh | 4 | ||||
-rwxr-xr-x | test/TEST-20-NFS/test.sh | 4 | ||||
-rwxr-xr-x | test/TEST-30-ISCSI/test.sh | 4 | ||||
-rwxr-xr-x | test/TEST-40-NBD/test.sh | 4 | ||||
-rwxr-xr-x | test/TEST-50-MULTINIC/test.sh | 4 |
9 files changed, 18 insertions, 18 deletions
diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh index 0e7fed5..7369cc0 100755 --- a/test/TEST-10-RAID/test.sh +++ b/test/TEST-10-RAID/test.sh @@ -4,12 +4,12 @@ TEST_DESCRIPTION="root filesystem on an encrypted LVM PV on a RAID-5" KVERSION=${KVERSION-$(uname -r)} # Uncomment this to debug failures -#DEBUGFAIL="rdinitdebug rdnetdebug" +#DEBUGFAIL="rdshell" test_run() { $testdir/run-qemu -hda root.ext2 -m 256M -nographic \ -net none -kernel /boot/vmlinuz-$KVERSION \ - -append "root=/dev/dracut/root rw quiet console=ttyS0,115200n81 selinux=0 rdshell $DEBUGFAIL" \ + -append "root=/dev/dracut/root rw quiet console=ttyS0,115200n81 selinux=0 rdinitdebug rdnetdebug $DEBUGFAIL" \ -initrd initramfs.testing grep -m 1 -q dracut-root-block-success root.ext2 || return 1 } diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-11-LVM/test.sh index 0bc9b9f..f351114 100755 --- a/test/TEST-11-LVM/test.sh +++ b/test/TEST-11-LVM/test.sh @@ -4,12 +4,12 @@ TEST_DESCRIPTION="root filesystem on LVM PV" KVERSION=${KVERSION-$(uname -r)} # Uncomment this to debug failures -#DEBUGFAIL="rdinitdebug rdnetdebug" +#DEBUGFAIL="rdshell" test_run() { $testdir/run-qemu -hda root.ext2 -m 256M -nographic \ -net none -kernel /boot/vmlinuz-$KVERSION \ - -append "root=/dev/dracut/root rw quiet rdinfo console=ttyS0,115200n81 selinux=0 rdshell $DEBUGFAIL" \ + -append "root=/dev/dracut/root rw quiet rdinfo console=ttyS0,115200n81 selinux=0 rdinitdebug rdnetdebug $DEBUGFAIL" \ -initrd initramfs.testing grep -m 1 -q dracut-root-block-success root.ext2 || return 1 } diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh index 4d88d79..9b76991 100755 --- a/test/TEST-12-RAID-DEG/test.sh +++ b/test/TEST-12-RAID-DEG/test.sh @@ -4,13 +4,13 @@ TEST_DESCRIPTION="root filesystem on an encrypted LVM PV on a degraded RAID-5" KVERSION=${KVERSION-$(uname -r)} # Uncomment this to debug failures -#DEBUGFAIL="rdinitdebug rdnetdebug" +#DEBUGFAIL="rdshell" client_run() { echo "CLIENT TEST START: $@" $testdir/run-qemu -hda root.ext2 -m 256M -nographic \ -net none -kernel /boot/vmlinuz-$KVERSION \ - -append "$@ root=LABEL=root rw quiet rdinfo console=ttyS0,115200n81 selinux=0 rdshell $DEBUGFAIL " \ + -append "$@ root=LABEL=root rw quiet rdinfo console=ttyS0,115200n81 selinux=0 rdinitdebug rdnetdebug $DEBUGFAIL " \ -initrd initramfs.testing if ! grep -m 1 -q dracut-root-block-success root.ext2; then echo "CLIENT TEST END: $@ [FAIL]" diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh index 55af484..ae3f870 100755 --- a/test/TEST-13-ENC-RAID-LVM/test.sh +++ b/test/TEST-13-ENC-RAID-LVM/test.sh @@ -4,12 +4,12 @@ TEST_DESCRIPTION="root filesystem on LVM on encrypted partitions of a RAID-5" KVERSION=${KVERSION-$(uname -r)} # Uncomment this to debug failures -#DEBUGFAIL="rdinitdebug rdnetdebug" +#DEBUGFAIL="rdshell" test_run() { $testdir/run-qemu -hda root.ext2 -m 256M -nographic \ -net none -kernel /boot/vmlinuz-$KVERSION \ - -append "root=/dev/dracut/root rw quiet rdinfo console=ttyS0,115200n81 selinux=0 rdshell $DEBUGFAIL" \ + -append "root=/dev/dracut/root rw quiet rdinfo console=ttyS0,115200n81 selinux=0 rdinitdebug rdnetdebug $DEBUGFAIL" \ -initrd initramfs.testing grep -m 1 -q dracut-root-block-success root.ext2 || return 1 } diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh index d86afc2..bfc186f 100755 --- a/test/TEST-14-IMSM/test.sh +++ b/test/TEST-14-IMSM/test.sh @@ -4,13 +4,13 @@ TEST_DESCRIPTION="root filesystem on LVM PV on a isw dmraid" KVERSION=${KVERSION-$(uname -r)} # Uncomment this to debug failures -#DEBUGFAIL="rdinitdebug rdnetdebug" +#DEBUGFAIL="rdshell" client_run() { echo "CLIENT TEST START: $@" $testdir/run-qemu -hda root.ext2 -hdb disk1 -hdc disk2 -m 256M -nographic \ -net none -kernel /boot/vmlinuz-$KVERSION \ - -append "$@ root=LABEL=root rw quiet rdinfo console=ttyS0,115200n81 selinux=0 rdshell $DEBUGFAIL" \ + -append "$@ root=LABEL=root rw quiet rdinfo console=ttyS0,115200n81 selinux=0 rdinitdebug rdnetdebug $DEBUGFAIL" \ -initrd initramfs.testing if ! grep -m 1 -q dracut-root-block-success root.ext2; then echo "CLIENT TEST END: $@ [FAIL]" diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh index e246ed0..9e5e6c4 100755 --- a/test/TEST-20-NFS/test.sh +++ b/test/TEST-20-NFS/test.sh @@ -4,7 +4,7 @@ TEST_DESCRIPTION="root filesystem on NFS" KVERSION=${KVERSION-$(uname -r)} # Uncomment this to debug failures -#DEBUGFAIL="rdinitdebug rdnetdebug" +#DEBUGFAIL="rdshell" run_server() { # Start server first @@ -46,7 +46,7 @@ client_test() { -net nic,macaddr=$mac,model=e1000 \ -net socket,mcast=230.0.0.1:1234 \ -kernel /boot/vmlinuz-$KVERSION \ - -append "$cmdline $DEBUGFAIL rdshell ro quiet console=ttyS0,115200n81 selinux=0" \ + -append "$cmdline $DEBUGFAIL rdinitdebug rdnetdebug ro quiet console=ttyS0,115200n81 selinux=0" \ -initrd initramfs.testing if [[ $? -ne 0 ]] || ! grep -m 1 -q nfs-OK client.img; then diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh index dc32775..032fba4 100755 --- a/test/TEST-30-ISCSI/test.sh +++ b/test/TEST-30-ISCSI/test.sh @@ -3,7 +3,7 @@ TEST_DESCRIPTION="root filesystem over iSCSI" KVERSION=${KVERSION-$(uname -r)} -#DEBUGFAIL="rdinitdebug rdnetdebug rdudevinfo" +#DEBUGFAIL="rdshell" run_server() { # Start server first @@ -37,7 +37,7 @@ run_client() { -net nic,macaddr=52:54:00:12:34:00,model=e1000 \ -net socket,mcast=230.0.0.1:1235 \ -kernel /boot/vmlinuz-$KVERSION \ - -append "root=dhcp rw quiet console=ttyS0,115200n81 selinux=0 rdshell $DEBUGFAIL" \ + -append "root=dhcp rw quiet rdinitdebug rdnetdebug console=ttyS0,115200n81 selinux=0 rdshell $DEBUGFAIL" \ -initrd initramfs.testing grep -m 1 -q iscsi-OK client.img || return 1 } diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh index 1dfa032..b05441d 100755 --- a/test/TEST-40-NBD/test.sh +++ b/test/TEST-40-NBD/test.sh @@ -4,7 +4,7 @@ TEST_DESCRIPTION="root filesystem on NBD" KVERSION=${KVERSION-$(uname -r)} # Uncomment this to debug failures -#DEBUGFAIL="rdinitdebug rdnetdebug" +#DEBUGFAIL="rdshell" run_server() { # Start server first @@ -50,7 +50,7 @@ client_test() { -net nic,macaddr=$mac,model=e1000 \ -net socket,mcast=230.0.0.1:1236 \ -kernel /boot/vmlinuz-$KVERSION \ - -append "$cmdline $DEBUGFAIL rdshell ro quiet console=ttyS0,115200n81 selinux=0" \ + -append "$cmdline $DEBUGFAIL rdinitdebug rdnetdebug ro quiet console=ttyS0,115200n81 selinux=0" \ -initrd initramfs.testing if [[ $? -ne 0 ]] || ! grep -m 1 -q nbd-OK flag.img; then diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh index 0348a9b..f74370a 100755 --- a/test/TEST-50-MULTINIC/test.sh +++ b/test/TEST-50-MULTINIC/test.sh @@ -4,7 +4,7 @@ TEST_DESCRIPTION="root filesystem on NFS with multiple nics" KVERSION=${KVERSION-$(uname -r)} # Uncomment this to debug failures -#DEBUGFAIL="rdinitdebug rdnetdebug" +#DEBUGFAIL="rdshell" run_server() { # Start server first @@ -15,7 +15,7 @@ run_server() { -net socket,mcast=230.0.0.1:1234 \ -serial udp:127.0.0.1:9999 \ -kernel /boot/vmlinuz-$KVERSION \ - -append "selinux=0 root=/dev/sda rw quiet console=ttyS0,115200n81" \ + -append "selinux=0 root=/dev/sda rdinitdebug rdnetdebug rw quiet console=ttyS0,115200n81" \ -initrd initramfs.server -pidfile server.pid -daemonize || return 1 sudo chmod 644 server.pid || return 1 |