summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Machata <petrm@nvidia.com>2024-10-17 12:45:45 +0300
committerPaolo Abeni <pabeni@redhat.com>2024-10-22 14:33:47 +0300
commit0e07d5dbfbd9b0441ae4ec07a2a72738121356e2 (patch)
tree2b0e323add7d8e404db8a75d04cfe59f1087e123
parentb4b0549a4e59747b49619b2edabfb0d04e37c0b9 (diff)
downloadlinux-0e07d5dbfbd9b0441ae4ec07a2a72738121356e2.tar.xz
selftests: forwarding: lib: Allow passing PID to stop_traffic()
Now that it is possible to schedule a deferral of stop_traffic() right after the traffic is started, we do not have to rely on the %% magic to kill the background process that was started last. Instead we can just give the PID explicitly. This makes it possible to start other background processes after the traffic is started without confusing the cleanup. Signed-off-by: Petr Machata <petrm@nvidia.com> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
-rw-r--r--tools/testing/selftests/net/forwarding/lib.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh
index 76e6d7698caf..89c25f72b10c 100644
--- a/tools/testing/selftests/net/forwarding/lib.sh
+++ b/tools/testing/selftests/net/forwarding/lib.sh
@@ -1768,8 +1768,10 @@ start_tcp_traffic()
stop_traffic()
{
+ local pid=${1-%%}; shift
+
# Suppress noise from killing mausezahn.
- { kill %% && wait %%; } 2>/dev/null
+ { kill $pid && wait $pid; } 2>/dev/null
}
declare -A cappid