summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xkernel/networking/libvirt/netperf-client/runtest.sh4
-rwxr-xr-xkernel/networking/libvirt/netperf-server/runtest.sh4
-rwxr-xr-xkernel/networking/libvirt/ping/runtest.sh6
3 files changed, 8 insertions, 6 deletions
diff --git a/kernel/networking/libvirt/netperf-client/runtest.sh b/kernel/networking/libvirt/netperf-client/runtest.sh
index 89d4296..f6c9b7c 100755
--- a/kernel/networking/libvirt/netperf-client/runtest.sh
+++ b/kernel/networking/libvirt/netperf-client/runtest.sh
@@ -47,10 +47,10 @@ for guest in $GUESTS; do
done
IFS=";"
for addr in $valid_addrs; do
- ../common/autologin.exp $guest "netperf -4 -H $addr -l $PERF_TIME" && pass VALID|| fail VALID
+ ../common/autologin.exp $guest "netperf -4 -H $addr -l $PERF_TIME" || fail VALID
done
for addr in $invalid_addrs; do
- ../common/autologin.exp $guest "netperf -4 -H $addr -l $PERF_TIME" && pass INVALID|| fail INVALID
+ ../common/autologin.exp $guest "netperf -4 -H $addr -l $PERF_TIME" || fail INVALID
done
unset IFS
done
diff --git a/kernel/networking/libvirt/netperf-server/runtest.sh b/kernel/networking/libvirt/netperf-server/runtest.sh
index 7b35fa0..ac0973e 100755
--- a/kernel/networking/libvirt/netperf-server/runtest.sh
+++ b/kernel/networking/libvirt/netperf-server/runtest.sh
@@ -40,8 +40,8 @@ fail()
}
for guest in $GUESTS; do
- ../common/autologin.exp $guest "service iptables stop" && pass IPTABLES || fail IPTABLES
- ../common/autologin.exp $guest "nohup netserver -4 >/dev/null 2>&1 &" && pass NETSERVER || fail NETSERVER
+ ../common/autologin.exp $guest "service iptables stop" || fail IPTABLES
+ ../common/autologin.exp $guest "nohup netserver -4 >/dev/null 2>&1 &" || fail NETSERVER
done
sleep 10
diff --git a/kernel/networking/libvirt/ping/runtest.sh b/kernel/networking/libvirt/ping/runtest.sh
index 62538b9..655ffaf 100755
--- a/kernel/networking/libvirt/ping/runtest.sh
+++ b/kernel/networking/libvirt/ping/runtest.sh
@@ -31,6 +31,7 @@
PING_COUNT=${PING_COUNT:="10"}
PING_SIZE=${PING_SIZE:="64"}
+fail=0
pass()
{
@@ -40,6 +41,7 @@ pass()
fail()
{
report_result $TEST/$WHITEBOARD/$guest/$1/$addr FAIL 1
+ fail=1
}
for guest in $GUESTS; do
@@ -48,10 +50,10 @@ for guest in $GUESTS; do
done
IFS=";"
for addr in $valid_addrs; do
- ../common/autologin.exp $guest "ping -c $PING_COUNT -i 0.2 -s $PING_SIZE $addr" && pass VALID|| fail VALID
+ ../common/autologin.exp $guest "ping -c $PING_COUNT -i 0.2 -s $PING_SIZE $addr" || fail VALID
done
for addr in $invalid_addrs; do
- ../common/autologin.exp $guest "ping -c $PING_COUNT -i 0.2 -s $PING_SIZE $addr" && pass INVALID|| fail INVALID
+ ../common/autologin.exp $guest "ping -c $PING_COUNT -i 0.2 -s $PING_SIZE $addr" || fail INVALID
done
unset IFS
done