test: change testsuite to local tcp rather than udp multicast

multicast needs an ethernet device and correct firewall rules
the loopback interface suites better as we only have 2 machines

diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
index 380fe01..01e1d7a 100755 (executable)
--- a/test/TEST-20-NFS/test.sh
+++ b/test/TEST-20-NFS/test.sh
@@ -12,7 +12,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,mcast=230.0.0.1:1234 \
+       -net socket,listen=127.0.0.1:12345 \
        -serial udp:127.0.0.1:9999 \
        -kernel /boot/vmlinuz-$KVERSION \
        -append "root=/dev/sda rw quiet console=ttyS0,115200n81 selinux=0" \
@@ -44,7 +44,7 @@ client_test() {
 
     $testdir/run-qemu -hda client.img -m 256M -nographic \
        -net nic,macaddr=$mac,model=e1000 \
-       -net socket,mcast=230.0.0.1:1234 \
+       -net socket,connect=127.0.0.1:12345 \
        -kernel /boot/vmlinuz-$KVERSION \
        -append "$cmdline $DEBUGFAIL rdinitdebug rdinfo quiet rdnetdebug ro console=ttyS0,115200n81 selinux=0" \
        -initrd initramfs.testing

diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh
index bde1e37..ba7465a 100755 (executable)
--- a/test/TEST-30-ISCSI/test.sh
+++ b/test/TEST-30-ISCSI/test.sh
@@ -11,7 +11,7 @@ run_server() {
 
     $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:1235 \
+       -net socket,listen=127.0.0.1:12345 \
        -serial udp:127.0.0.1:9999 \
        -kernel /boot/vmlinuz-$KVERSION \
        -append "root=/dev/sda rw quiet console=ttyS0,115200n81 selinux=0" \
@@ -35,7 +35,7 @@ run_client() {
 
     $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:1235 \
+       -net socket,connect=127.0.0.1:12345 \
        -kernel /boot/vmlinuz-$KVERSION \
        -append "root=dhcp rw quiet rdinitdebug rdinfo rdnetdebug console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" \
        -initrd initramfs.testing

diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh
index 5d714f2..c3e3eb8 100755 (executable)
--- a/test/TEST-50-MULTINIC/test.sh
+++ b/test/TEST-50-MULTINIC/test.sh
@@ -12,7 +12,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,mcast=230.0.0.1:1234 \
+       -net socket,listen=127.0.0.1:12345 \
        -serial udp:127.0.0.1:9999 \
        -kernel /boot/vmlinuz-$KVERSION \
        -append "selinux=0 root=/dev/sda rdinitdebug rdinfo rdnetdebug rw quiet console=ttyS0,115200n81" \
@@ -46,7 +46,7 @@ client_test() {
        -net nic,macaddr=52:54:00:12:34:$mac1,model=e1000 \
        -net nic,macaddr=52:54:00:12:34:$mac2,model=e1000 \
        -net nic,macaddr=52:54:00:12:34:$mac3,model=e1000 \
-       -net socket,mcast=230.0.0.1:1234 \
+       -net socket,connect=127.0.0.1:12345 \
        -kernel /boot/vmlinuz-$KVERSION \
        -append "$cmdline $DEBUGFAIL rdinitdebug rdinfo rdnetdebug ro quiet console=ttyS0,115200n81 selinux=0 rdshell rdcopystate" \
        -initrd initramfs.testing