Browse Source

test/TEST-*/test.sh: set -serial to null for servers

-serial udp might have stalled
master
Harald Hoyer 15 years ago
parent
commit
51b28ba9c4
  1. 4
      test/TEST-20-NFS/test.sh
  2. 4
      test/TEST-30-ISCSI/test.sh
  3. 4
      test/TEST-40-NBD/test.sh
  4. 4
      test/TEST-50-MULTINIC/test.sh

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

@ -5,6 +5,8 @@ KVERSION=${KVERSION-$(uname -r)} @@ -5,6 +5,8 @@ KVERSION=${KVERSION-$(uname -r)}

# Uncomment this to debug failures
#DEBUGFAIL="rd.shell"
#SERIAL="-serial udp:127.0.0.1:9999"
SERIAL="null"

run_server() {
# Start server first
@ -13,7 +15,7 @@ run_server() { @@ -13,7 +15,7 @@ run_server() {
$testdir/run-qemu -hda server.ext2 -m 256M -nographic \
-net nic,macaddr=52:54:00:12:34:56,model=e1000 \
-net socket,listen=127.0.0.1:12345 \
-serial udp:127.0.0.1:9999 \
-serial $SERIAL \
-kernel /boot/vmlinuz-$KVERSION \
-append "root=/dev/sda rw quiet console=ttyS0,115200n81 selinux=0" \
-initrd initramfs.server -pidfile server.pid -daemonize || return 1

4
test/TEST-30-ISCSI/test.sh

@ -4,6 +4,8 @@ TEST_DESCRIPTION="root filesystem over iSCSI" @@ -4,6 +4,8 @@ TEST_DESCRIPTION="root filesystem over iSCSI"
KVERSION=${KVERSION-$(uname -r)}

#DEBUGFAIL="rd.shell"
#SERIAL="-serial udp:127.0.0.1:9999"
SERIAL="null"

run_server() {
# Start server first
@ -13,7 +15,7 @@ run_server() { @@ -13,7 +15,7 @@ run_server() {
-hdc iscsidisk2.img -hdd iscsidisk3.img \
-net nic,macaddr=52:54:00:12:34:56,model=e1000 \
-net socket,listen=127.0.0.1:12345 \
-serial udp:127.0.0.1:9999 \
-serial $SERIAL \
-kernel /boot/vmlinuz-$KVERSION \
-append "root=/dev/sda rw quiet console=ttyS0,115200n81 selinux=0" \
-initrd initramfs.server -pidfile server.pid -daemonize || return 1

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

@ -5,6 +5,8 @@ KVERSION=${KVERSION-$(uname -r)} @@ -5,6 +5,8 @@ KVERSION=${KVERSION-$(uname -r)}

# Uncomment this to debug failures
#DEBUGFAIL="rd.shell"
#SERIAL="udp:127.0.0.1:9999"
SERIAL="null"

run_server() {
# Start server first
@ -14,7 +16,7 @@ run_server() { @@ -14,7 +16,7 @@ run_server() {
-m 256M -nographic \
-net nic,macaddr=52:54:00:12:34:56,model=e1000 \
-net socket,listen=127.0.0.1:12345 \
-serial udp:127.0.0.1:9999 \
-serial $SERIAL \
-kernel /boot/vmlinuz-$KVERSION \
-append "root=/dev/sda rw quiet console=ttyS0,115200n81 selinux=0" \
-initrd initramfs.server -pidfile server.pid -daemonize || return 1

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

@ -5,6 +5,8 @@ KVERSION=${KVERSION-$(uname -r)} @@ -5,6 +5,8 @@ KVERSION=${KVERSION-$(uname -r)}

# Uncomment this to debug failures
#DEBUGFAIL="rd.shell"
#SERIAL="udp:127.0.0.1:9999"
SERIAL="null"

run_server() {
# Start server first
@ -13,7 +15,7 @@ run_server() { @@ -13,7 +15,7 @@ run_server() {
$testdir/run-qemu -hda server.ext2 -m 256M -nographic \
-net nic,macaddr=52:54:00:12:34:56,model=e1000 \
-net socket,listen=127.0.0.1:12345 \
-serial udp:127.0.0.1:9999 \
-serial $SERIAL \
-kernel /boot/vmlinuz-$KVERSION \
-append "selinux=0 root=/dev/sda rd.debug rd.info rw quiet console=ttyS0,115200n81" \
-initrd initramfs.server -pidfile server.pid -daemonize || return 1

Loading…
Cancel
Save