]> www.infradead.org Git - users/hch/misc.git/commitdiff
selftests: defer: Introduce DEFER_PAUSE_ON_FAIL
authorPetr Machata <petrm@nvidia.com>
Thu, 4 Sep 2025 17:07:25 +0000 (19:07 +0200)
committerJakub Kicinski <kuba@kernel.org>
Fri, 12 Sep 2025 02:02:51 +0000 (19:02 -0700)
The fact that all cleanup (ideally) goes through the defer framework makes
debugging of these commands a bit tricky. However, this also gives us a
nice point to place a hook along the lines of PAUSE_ON_FAIL. When the
environment variable DEFER_PAUSE_ON_FAIL is set, and a cleanup command
results in non-zero exit status, show a bit of debuginfo and give the user
an opportunity to interrupt the execution altogether.

Signed-off-by: Petr Machata <petrm@nvidia.com>
Acked-by: Nikolay Aleksandrov <razor@blackwall.org>
Link: https://patch.msgid.link/2a07d24568ede6c42e4701657fa0b738e490fe59.1757004393.git.petrm@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
tools/testing/selftests/net/lib/sh/defer.sh

index 6c642f3d0ced6a425783c334c38d0d31dffc69a0..47ab78c4d4656eb63f1940cafbbda60269dd645e 100644 (file)
@@ -1,6 +1,10 @@
 #!/bin/bash
 # SPDX-License-Identifier: GPL-2.0
 
+# Whether to pause and allow debugging when an executed deferred command has a
+# non-zero exit code.
+: "${DEFER_PAUSE_ON_FAIL:=no}"
+
 # map[(scope_id,track,cleanup_id) -> cleanup_command]
 # track={d=default | p=priority}
 declare -A __DEFER__JOBS
@@ -38,8 +42,20 @@ __defer__run()
        local track=$1; shift
        local defer_ix=$1; shift
        local defer_key=$(__defer__defer_key $track $defer_ix)
+       local ret
 
        eval ${__DEFER__JOBS[$defer_key]}
+       ret=$?
+
+       if [[ "$DEFER_PAUSE_ON_FAIL" == yes && "$ret" -ne 0 ]]; then
+               echo "Deferred command (track $track index $defer_ix):"
+               echo "  ${__DEFER__JOBS[$defer_key]}"
+               echo "... ended with an exit status of $ret"
+               echo "Hit enter to continue, 'q' to quit"
+               read a
+               [[ "$a" == q ]] && exit 1
+       fi
+
        unset __DEFER__JOBS[$defer_key]
 }