Browse Source

test: s/ib700wdt/i6300esbwdt/g

master
Harald Hoyer 13 years ago
parent
commit
23d6dcd125
  1. 4
      test/TEST-01-BASIC/test.sh
  2. 4
      test/TEST-03-USR-MOUNT/test.sh
  3. 2
      test/TEST-04-FULL-SYSTEMD/test.sh
  4. 10
      test/TEST-20-NFS/test.sh
  5. 2
      test/TEST-40-NBD/test.sh
  6. 8
      test/TEST-50-MULTINIC/test.sh

4
test/TEST-01-BASIC/test.sh

@ -13,7 +13,7 @@ test_run() { @@ -13,7 +13,7 @@ test_run() {
-hdb $TESTDIR/result \
-m 256M -nographic \
-net none -kernel /boot/vmlinuz-$KVERSION \
-watchdog ib700 -watchdog-action poweroff \
-watchdog i6300esb -watchdog-action poweroff \
-append "root=LABEL=dracut rw systemd.log_level=debug systemd.log_target=console rd.retry=3 rd.debug console=ttyS0,115200n81 $DEBUGFAIL" \
-initrd $TESTDIR/initramfs.testing || return 1
grep -m 1 -q dracut-root-block-success $TESTDIR/result || return 1
@ -85,7 +85,7 @@ test_setup() { @@ -85,7 +85,7 @@ test_setup() {
)
sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
-a "debug watchdog" \
-d "piix ide-gd_mod ata_piix ext3 sd_mod ib700wdt" \
-d "piix ide-gd_mod ata_piix ext3 sd_mod i6300esbwdt" \
-f $TESTDIR/initramfs.testing $KVERSION || return 1

# -o "plymouth network md dmraid multipath fips caps crypt btrfs resume dmsquash-live dm"

4
test/TEST-03-USR-MOUNT/test.sh

@ -20,7 +20,7 @@ client_run() { @@ -20,7 +20,7 @@ client_run() {
-hdc $TESTDIR/result \
-m 256M -nographic \
-net none -kernel /boot/vmlinuz-$KVERSION \
-watchdog ib700 -watchdog-action poweroff \
-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" \
-initrd $TESTDIR/initramfs.testing

@ -121,7 +121,7 @@ test_setup() { @@ -121,7 +121,7 @@ test_setup() {
sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
-a "debug watchdog" \
-o "network" \
-d "piix ide-gd_mod ata_piix btrfs sd_mod ib700wdt" \
-d "piix ide-gd_mod ata_piix btrfs sd_mod i6300esbwdt" \
-f $TESTDIR/initramfs.testing $KVERSION || return 1

rm -rf $TESTDIR/overlay

2
test/TEST-04-FULL-SYSTEMD/test.sh

@ -263,7 +263,7 @@ EOF @@ -263,7 +263,7 @@ EOF
sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
-a "debug watchdog systemd" \
-o "network" \
-d "piix ide-gd_mod ata_piix btrfs sd_mod ib700wdt" \
-d "piix ide-gd_mod ata_piix btrfs sd_mod i6300esbwdt" \
-f $TESTDIR/initramfs.testing $KVERSION || return 1

rm -rf $TESTDIR/overlay

10
test/TEST-20-NFS/test.sh

@ -18,7 +18,7 @@ run_server() { @@ -18,7 +18,7 @@ run_server() {
-net nic,macaddr=52:54:00:12:34:56,model=e1000 \
-net socket,listen=127.0.0.1:12320 \
-serial $SERIAL \
-watchdog ib700 -watchdog-action poweroff \
-watchdog i6300esb -watchdog-action poweroff \
-kernel /boot/vmlinuz-$KVERSION \
-append "rd.debug loglevel=77 root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0" \
-initrd $TESTDIR/initramfs.server \
@ -54,7 +54,7 @@ client_test() { @@ -54,7 +54,7 @@ client_test() {
-net nic,macaddr=$mac,model=e1000 \
-net socket,connect=127.0.0.1:12320 \
-kernel /boot/vmlinuz-$KVERSION \
-watchdog ib700 -watchdog-action poweroff \
-watchdog i6300esb -watchdog-action poweroff \
-append "$cmdline $DEBUGFAIL rd.debug rd.retry=10 rd.info quiet ro console=ttyS0,115200n81 selinux=0" \
-initrd $TESTDIR/initramfs.testing

@ -336,14 +336,14 @@ test_setup() { @@ -336,14 +336,14 @@ test_setup() {
# Make server's dracut image
$basedir/dracut.sh -l -i $TESTDIR/overlay / \
-m "dash udev-rules base rootfs-block debug kernel-modules watchdog" \
-d "af_packet piix ide-gd_mod ata_piix ext3 sd_mod e1000 ib700wdt" \
-d "af_packet piix ide-gd_mod ata_piix ext3 sd_mod e1000 i6300esb" \
-f $TESTDIR/initramfs.server $KVERSION || return 1

# Make client's dracut image
$basedir/dracut.sh -l -i $TESTDIR/overlay / \
-o "plymouth" \
-o "plymouth dash" \
-a "debug watchdog" \
-d "af_packet piix ide-gd_mod ata_piix sd_mod e1000 nfs sunrpc ib700wdt" \
-d "af_packet piix ide-gd_mod ata_piix sd_mod e1000 nfs sunrpc i6300esb" \
-f $TESTDIR/initramfs.testing $KVERSION || return 1
}


2
test/TEST-40-NBD/test.sh

@ -343,7 +343,7 @@ test_setup() { @@ -343,7 +343,7 @@ test_setup() {
sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
-o "plymouth" \
-a "debug watchdog" \
-d "af_packet piix ide-gd_mod ata_piix ext2 ext3 sd_mod e1000 ib700wdt" \
-d "af_packet piix ide-gd_mod ata_piix ext2 ext3 sd_mod e1000 i6300esbwdt" \
-f $TESTDIR/initramfs.testing $KVERSION || return 1
}


8
test/TEST-50-MULTINIC/test.sh

@ -18,7 +18,7 @@ run_server() { @@ -18,7 +18,7 @@ run_server() {
-net nic,macaddr=52:54:00:12:34:56,model=e1000 \
-net socket,listen=127.0.0.1:12350 \
-serial $SERIAL \
-watchdog ib700 -watchdog-action poweroff \
-watchdog i6300esb -watchdog-action poweroff \
-kernel /boot/vmlinuz-$KVERSION \
-append "selinux=0 root=/dev/sda rootfstype=ext3 rd.debug rd.info rw loglevel=77 console=ttyS0,115200n81" \
-initrd $TESTDIR/initramfs.server -pidfile $TESTDIR/server.pid -daemonize || return 1
@ -53,7 +53,7 @@ client_test() { @@ -53,7 +53,7 @@ client_test() {
-net nic,macaddr=52:54:00:12:34:$mac3,model=e1000 \
-net socket,connect=127.0.0.1:12350 \
-hdc /dev/null \
-watchdog ib700 -watchdog-action poweroff \
-watchdog i6300esb -watchdog-action poweroff \
-kernel /boot/vmlinuz-$KVERSION \
-append "$cmdline $DEBUGFAIL rd.retry=5 rd.debug rd.info ro rd.systemd.log_level=debug console=ttyS0,115200n81 selinux=0 rd.copystate rd.chroot init=/sbin/init" \
-initrd $TESTDIR/initramfs.testing
@ -246,14 +246,14 @@ test_setup() { @@ -246,14 +246,14 @@ test_setup() {
# Make server's dracut image
$basedir/dracut.sh -l -i $TESTDIR/overlay / \
-m "dash udev-rules base rootfs-block debug kernel-modules watchdog" \
-d "af_packet piix ide-gd_mod ata_piix ext3 sd_mod e1000 ib700wdt" \
-d "af_packet piix ide-gd_mod ata_piix ext3 sd_mod e1000 i6300esbwdt" \
-f $TESTDIR/initramfs.server $KVERSION || return 1

# Make client's dracut image
$basedir/dracut.sh -l -i $TESTDIR/overlay / \
-o "plymouth" \
-a "debug" \
-d "af_packet piix sd_mod sr_mod ata_piix ide-gd_mod e1000 nfs sunrpc ib700wdt" \
-d "af_packet piix sd_mod sr_mod ata_piix ide-gd_mod e1000 nfs sunrpc i6300esbwdt" \
-f $TESTDIR/initramfs.testing $KVERSION || return 1
}


Loading…
Cancel
Save