Attempt to kill remote pings in a more reliable way

diff --git a/tests/ethflood64k-w2.sh b/tests/ethflood64k-w2.sh
index ad7173d4189d646ab0a40a8274c174b4f4f7458e..727bb5370116217c2d7c085c79ce5a9f1dd7c289 100755 (executable)
--- a/tests/ethflood64k-w2.sh
+++ b/tests/ethflood64k-w2.sh
@@ -5,19 +5,19 @@
 t() {
     for i in norm boost; do
        for budget in 300 1 1000; do
-           echo $budget > /proc/sys/net/core/netdev_budget
-           ssh root@${SSH_CONNECTION%% *} 'ping -fs 64000 ${SSH_CONNECTION%% *}' &
-           PID_PING=$!
-           echo 0 1 > $DRIVER-$i-$budget-1000.dat
            if [ $budget -eq 300 -o $DRIVER == "socketcan" ]; then
                if [ $i != "boost" ] || boost_irq_prio 90; then
+                   echo $budget > /proc/sys/net/core/netdev_budget
+                   ssh root@${SSH_CONNECTION%% *} 'ping -fs 64000 ${SSH_CONNECTION%% *}' &
+                   PID_PING=$!
+                   echo 0 1 > $DRIVER-$i-$budget-1000.dat
                    PID_S=`vca_canping -s 1 -b -R FF:$RTPRIO -d $CAN1`
                    vca_canping -m 1 -R FF:$RTPRIO -v -g $DRIVER-$i-$budget -t 1 -d $CAN0 -w 2 -c $COUNT
                    kill $PID_S
+                   kill $PID_PING
+                   sleep 1 # Wait for remote buffers to become empty
                fi
            fi
-           kill $PID_PING
-           sleep 1 # Wait for remote buffers to become empty
        done
     done
 }

diff --git a/tests/ethflood64k.sh b/tests/ethflood64k.sh
index e6af1634e21a4480064ab1fde217b518a79a9d1a..50ed6522381cf610c22c9afd0e6cf46d3f6f9139 100755 (executable)
--- a/tests/ethflood64k.sh
+++ b/tests/ethflood64k.sh
@@ -5,19 +5,19 @@
 t() {
     for i in norm boost; do
        for budget in 300 1 1000; do
-           echo $budget > /proc/sys/net/core/netdev_budget
-           ssh root@${SSH_CONNECTION%% *} 'ping -fs 64000 ${SSH_CONNECTION%% *}' &
-           PID_PING=$!
-           echo 0 1 > $DRIVER-$i-$budget-1000.dat
            if [ $budget -eq 300 -o $DRIVER == "socketcan" ]; then
                if [ $i != "boost" ] || boost_irq_prio 90; then
+                   echo $budget > /proc/sys/net/core/netdev_budget
+                   ssh root@${SSH_CONNECTION%% *} 'ping -fs 64000 ${SSH_CONNECTION%% *}' &
+                   PID_PING=$!
+                   echo 0 1 > $DRIVER-$i-$budget-1000.dat
                    PID_S=`vca_canping -s 1 -b -R FF:$RTPRIO -d $CAN1`
                    vca_canping -m 1 -R FF:$RTPRIO -v -g $DRIVER-$i-$budget -t 1 -d $CAN0 -w 0 -c $COUNT
                    kill $PID_S
+                   kill $PID_PING
+                   sleep 1 # Wait for remote buffers to become empty
                fi
            fi
-           kill $PID_PING
-           sleep 1 # Wait for remote buffers to become empty
        done
     done
 }