]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
selftests/vsock: make wait_for_listener() work even if pipefail is on
authorBobby Eshleman <bobbyeshleman@meta.com>
Sat, 8 Nov 2025 16:00:53 +0000 (08:00 -0800)
committerJakub Kicinski <kuba@kernel.org>
Wed, 12 Nov 2025 14:19:38 +0000 (06:19 -0800)
Rewrite wait_for_listener()'s pattern matching to avoid tripping the
if-condition when pipefail is on.

awk doesn't gracefully handle SIGPIPE with a non-zero exit code, so grep
exiting upon finding a match causes false-positives when the pipefail
option is used (grep exits, SIGPIPE emits, and awk complains with a
non-zero exit code). Instead, move all of the pattern matching into awk
so that SIGPIPE cannot happen and the correct exit code is returned.

Signed-off-by: Bobby Eshleman <bobbyeshleman@meta.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Link: https://patch.msgid.link/20251108-vsock-selftests-fixes-and-improvements-v4-2-d5e8d6c87289@meta.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
tools/testing/selftests/vsock/vmtest.sh

index bc16b13cdbe3442fbeed35d5afedf053b279b718..01ce16523afbc5dc8435ec2e4342766c5ec83ef7 100755 (executable)
@@ -251,9 +251,11 @@ wait_for_listener()
 
        # for tcp protocol additionally check the socket state
        [ "${protocol}" = "tcp" ] && pattern="${pattern}0A"
+
        for i in $(seq "${max_intervals}"); do
-               if awk '{print $2" "$4}' /proc/net/"${protocol}"* | \
-                  grep -q "${pattern}"; then
+               if awk -v pattern="${pattern}" \
+                       'BEGIN {rc=1} $2" "$4 ~ pattern {rc=0} END {exit rc}' \
+                       /proc/net/"${protocol}"*; then
                        break
                fi
                sleep "${interval}"