projects
/
linux
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bfc6507
)
selftests: net: lib: ignore possible errors
author
Matthieu Baerts (NGI0)
<matttbe@kernel.org>
Fri, 7 Jun 2024 16:31:02 +0000
(18:31 +0200)
committer
Jakub Kicinski
<kuba@kernel.org>
Wed, 12 Jun 2024 02:30:24 +0000
(19:30 -0700)
No need to disable errexit temporary, simply ignore the only possible
and not handled error.
Reviewed-by: Geliang Tang <geliang@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link:
https://lore.kernel.org/r/20240607-upstream-net-next-20240607-selftests-mptcp-net-lib-v1-1-e36986faac94@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
tools/testing/selftests/net/lib.sh
patch
|
blob
|
history
diff --git
a/tools/testing/selftests/net/lib.sh
b/tools/testing/selftests/net/lib.sh
index 9155c914c064fe542fae87631561692e48104a26..b2572aff6286f1dbf83640d3ed3ded3a9b734b8f 100644
(file)
--- a/
tools/testing/selftests/net/lib.sh
+++ b/
tools/testing/selftests/net/lib.sh
@@
-128,25
+128,17
@@
slowwait_for_counter()
cleanup_ns()
{
local ns=""
- local errexit=0
local ret=0
- # disable errexit temporary
- if [[ $- =~ "e" ]]; then
- errexit=1
- set +e
- fi
-
for ns in "$@"; do
[ -z "${ns}" ] && continue
- ip netns delete "${ns}" &> /dev/null
+ ip netns delete "${ns}" &> /dev/null
|| true
if ! busywait $BUSYWAIT_TIMEOUT ip netns list \| grep -vq "^$ns$" &> /dev/null; then
echo "Warn: Failed to remove namespace $ns"
ret=1
fi
done
- [ $errexit -eq 1 ] && set -e
return $ret
}