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

-serial udp might have stalled

diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
index 455fda68d958d23f17616d27545164806b87623a..ca22c215832233794568bd393a6b92aaf35f564b 100755 (executable)
--- a/test/TEST-20-NFS/test.sh
+++ b/test/TEST-20-NFS/test.sh
@@ -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() {
     $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

diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh
index 125901501f654660058162f1fcc9ea194950d5f1..74027599f7695c1b6a22397bf00957f276b1395f 100755 (executable)
--- a/test/TEST-30-ISCSI/test.sh
+++ b/test/TEST-30-ISCSI/test.sh
@@ -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() {
        -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

diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh
index 9425427b46fc33475b81e166b3065afdc8b76ca9..0f648576e7534e9cb082627bd6e743327429ac33 100755 (executable)
--- a/test/TEST-40-NBD/test.sh
+++ b/test/TEST-40-NBD/test.sh
@@ -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() {
        -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

diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh
index dd9e3b1eada7c92de9a8127621e21f91c36f4e03..d7e9481f9f2c9c2b404abae68f2b93b31f64db17 100755 (executable)
--- a/test/TEST-50-MULTINIC/test.sh
+++ b/test/TEST-50-MULTINIC/test.sh
@@ -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() {
     $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