From 5831685cdba83ccadc544bdcdc6e77638ca061d9 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 1 Jul 2009 17:49:20 +0200 Subject: [PATCH] use _all_ modules to run the test, in case another module fails also run the tests with 256MB virtual machines --- test/TEST-10-RAID/test.sh | 5 ++--- test/TEST-20-NFS/test.sh | 5 ++--- test/TEST-30-ISCSI/test.sh | 8 +++----- test/TEST-40-NBD/test.sh | 7 +++---- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh index 501b03e..94b8152 100755 --- a/test/TEST-10-RAID/test.sh +++ b/test/TEST-10-RAID/test.sh @@ -7,7 +7,7 @@ KVERSION=${KVERSION-$(uname -r)} #DEBUGFAIL="rdinitdebug rdnetdebug" test_run() { - $testdir/run-qemu -hda root.ext2 -m 128M -nographic \ + $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 $DEBUGFAIL" \ -initrd initramfs.testing @@ -50,7 +50,7 @@ test_setup() { -f initramfs.makeroot $KVERSION || return 1 rm -rf overlay # Invoke KVM and/or QEMU to actually create the target filesystem. - $testdir/run-qemu -hda root.ext2 -m 128M -nographic -net none \ + $testdir/run-qemu -hda root.ext2 -m 256M -nographic -net none \ -kernel "/boot/vmlinuz-$kernel" \ -append "root=/dev/dracut/root rw rootfstype=ext2 quiet console=ttyS0,115200n81" \ -initrd initramfs.makeroot || return 1 @@ -63,7 +63,6 @@ test_setup() { inst ./cryptroot-ask /sbin/cryptroot-ask ) sudo $basedir/dracut -l -i overlay / \ - -m "dash crypt lvm mdraid udev-rules base rootfs-block" \ -d "ata_piix ext2 sd_mod" \ -f initramfs.testing $KVERSION || return 1 } diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh index d57e4f3..6850197 100755 --- a/test/TEST-20-NFS/test.sh +++ b/test/TEST-20-NFS/test.sh @@ -10,7 +10,7 @@ run_server() { # Start server first echo "NFS TEST SETUP: Starting DHCP/NFS server" - $testdir/run-qemu -hda server.ext2 -m 128M -nographic \ + $testdir/run-qemu -hda server.ext2 -m 256M -nographic \ -net nic,macaddr=52:54:00:12:34:56,model=e1000 \ -net socket,mcast=230.0.0.1:1234 \ -serial udp:127.0.0.1:9999 \ @@ -42,7 +42,7 @@ client_test() { return 1 fi - $testdir/run-qemu -hda client.img -m 128M -nographic \ + $testdir/run-qemu -hda client.img -m 256M -nographic \ -net nic,macaddr=$mac,model=e1000 \ -net socket,mcast=230.0.0.1:1234 \ -kernel /boot/vmlinuz-$KVERSION \ @@ -276,7 +276,6 @@ test_setup() { # Make client's dracut image $basedir/dracut -l -i overlay / \ - -m "dash udev-rules base network nfs debug" \ -d "e1000 nfs sunrpc" \ -f initramfs.testing $KVERSION || return 1 } diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh index a6833bf..5a10a07 100755 --- a/test/TEST-30-ISCSI/test.sh +++ b/test/TEST-30-ISCSI/test.sh @@ -9,7 +9,7 @@ run_server() { # Start server first echo "iSCSI TEST SETUP: Starting DHCP/iSCSI server" - $testdir/run-qemu -hda server.ext2 -hdb root.ext2 -m 128M -nographic \ + $testdir/run-qemu -hda server.ext2 -hdb root.ext2 -m 256M -nographic \ -net nic,macaddr=52:54:00:12:34:56,model=e1000 \ -net socket,mcast=230.0.0.1:1234 \ -serial udp:127.0.0.1:9999 \ @@ -33,7 +33,7 @@ run_client() { return 1 fi - $testdir/run-qemu -hda client.img -m 128M -nographic \ + $testdir/run-qemu -hda client.img -m 256M -nographic \ -net nic,macaddr=52:54:00:12:34:00,model=e1000 \ -net socket,mcast=230.0.0.1:1234 \ -kernel /boot/vmlinuz-$KVERSION \ @@ -100,7 +100,7 @@ test_setup() { return 1 fi # Invoke KVM and/or QEMU to actually create the target filesystem. - $testdir/run-qemu -hda root.ext2 -hdb client.img -m 128M -nographic -net none \ + $testdir/run-qemu -hda root.ext2 -hdb client.img -m 256M -nographic -net none \ -kernel "/boot/vmlinuz-$kernel" \ -append "root=/dev/dracut/root rw rootfstype=ext2 quiet console=ttyS0,115200n81" \ -initrd initramfs.makeroot || return 1 @@ -113,9 +113,7 @@ test_setup() { inst_simple ./hard-off.sh /emergency/01hard-off.sh # inst ./cryptroot-ask /sbin/cryptroot-ask ) -# -m "debug dash crypt lvm mdraid udev-rules base rootfs-block iscsi" \ sudo $basedir/dracut -l -i overlay / \ - -m "debug dash udev-rules base rootfs-block iscsi" \ -d "ata_piix ext2 sd_mod" \ -f initramfs.testing $KVERSION || return 1 diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh index b6d12b6..32a4e93 100755 --- a/test/TEST-40-NBD/test.sh +++ b/test/TEST-40-NBD/test.sh @@ -11,7 +11,7 @@ run_server() { echo "NBD TEST SETUP: Starting DHCP/NBD server" $testdir/run-qemu -hda server.ext2 -hdb nbd.ext2 -hdc encrypted.ext2 \ - -m 128M -nographic \ + -m 256M -nographic \ -net nic,macaddr=52:54:00:12:34:56,model=e1000 \ -net socket,mcast=230.0.0.1:1234 \ -serial udp:127.0.0.1:9999 \ @@ -46,7 +46,7 @@ client_test() { return 1 fi - $testdir/run-qemu -hda flag.img -m 128M -nographic \ + $testdir/run-qemu -hda flag.img -m 256M -nographic \ -net nic,macaddr=$mac,model=e1000 \ -net socket,mcast=230.0.0.1:1234 \ -kernel /boot/vmlinuz-$KVERSION \ @@ -213,7 +213,7 @@ make_encrypted_root() { rm -rf overlay # Invoke KVM and/or QEMU to actually create the target filesystem. - $testdir/run-qemu -hda flag.img -hdb encrypted.ext2 -m 128M \ + $testdir/run-qemu -hda flag.img -hdb encrypted.ext2 -m 256M \ -nographic -net none \ -kernel "/boot/vmlinuz-$kernel" \ -append "root=/dev/dracut/root rw quiet console=ttyS0,115200n81" \ @@ -308,7 +308,6 @@ test_setup() { -f initramfs.server $KVERSION || return 1 sudo $basedir/dracut -l -i overlay / \ - -m "dash crypt lvm mdraid udev-rules base rootfs-block nbd debug" \ -d "ata_piix ext2 ext3 sd_mod e1000" \ -f initramfs.testing $KVERSION || return 1 } -- 2.7.4