[tip: objtool/core] objtool: Keep failing test workdirs by default
From: tip-bot2 for Joe Lawrence
Date: Fri Sep 18 2026 - 06:25:39 EST
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 1ed3ce15096762e5e470921bd6c9f288de2d90f5
Gitweb: https://git.kernel.org/tip/1ed3ce15096762e5e470921bd6c9f288de2d90f5
Author: Joe Lawrence <joe.lawrence@xxxxxxxxxx>
AuthorDate: Wed, 16 Sep 2026 11:43:03 -07:00
Committer: Josh Poimboeuf <jpoimboe@xxxxxxxxxx>
CommitterDate: Wed, 16 Sep 2026 17:13:26 -07:00
objtool: Keep failing test workdirs by default
The klp test runner deletes each test's working directory when the test
finishes. On failure that removes diff.log, out.o and the fixture objects
before the developer can look at them, and the only hint was to re-run
(something) with --keep:
$ make -C tools/objtool tests
...
not ok - test-special-section: expected section '.kcfi_traps' in output
...
# pass:49 fail:1 static-skip:1 probe-skip:0 xfail:0 xpass:0
# re-run with --keep to hold on to what a failing test built
Change the default behavior to save failing test working directories. This
is friendlier to the drive-by tester. Provide the power-user with a KEEP
Makefile variable that can optionally retain 'all' or 'none' of those
directories. run-tests.sh --keep remains an alias for KEEP=all.
Now that a run can be holding objects worth looking at, say where they are
when it is cut short. A Ctrl-C left the run directory behind -- the tests
clean up after themselves as they exit, but the two levels the runner made
are its own to answer for, and nothing removed them. Take them away from
a trap if the tests left them empty, and print the path if they did not:
under the new default the test that was running keeps what it had built,
and that is the run most worth being told about.
The trap only ever rmdirs, so it cannot overrule what a test decided to
keep; the same helper now serves the end of a normal run.
Signed-off-by: Joe Lawrence <joe.lawrence@xxxxxxxxxx>
Assisted-by: Claude:claude-opus-5
Signed-off-by: Song Liu <song@xxxxxxxxxx>
Link: https://patch.msgid.link/20260916184351.2720310-11-song@xxxxxxxxxx
Signed-off-by: Josh Poimboeuf <jpoimboe@xxxxxxxxxx>
---
tools/objtool/Documentation/klp-test-design.txt | 14 +-
tools/objtool/Makefile | 2 +-
tools/objtool/tests/lib.sh | 62 +++++++++--
tools/objtool/tests/run-tests.sh | 92 +++++++++++++---
4 files changed, 136 insertions(+), 34 deletions(-)
diff --git a/tools/objtool/Documentation/klp-test-design.txt b/tools/objtool/Documentation/klp-test-design.txt
index ec56bfb..67d20bf 100644
--- a/tools/objtool/Documentation/klp-test-design.txt
+++ b/tools/objtool/Documentation/klp-test-design.txt
@@ -199,10 +199,11 @@ source layout::
generic/test-basic/{orig.o,patched.o,out.o,Module.symvers,...}
x86/test-kcfi/...
-``--keep`` leaves it and reports the one path. Otherwise each test removes its
-own directory and the runner ``rmdir``s the run's -- which fails if anything
-was left behind, so a test which dies without cleaning up is reported rather
-than silently leaking.
+By default (``KEEP=failed``) only failing tests keep their directories; the
+runner reports where they are. ``KEEP=all`` keeps every test's directory;
+``KEEP=none`` removes them all. The runner ``rmdir``s the run directory when
+it is empty -- which fails if anything was left behind unexpectedly, so a test
+which dies without cleaning up is reported rather than silently leaking.
Running
@@ -216,7 +217,10 @@ Running
CC=clang make -C tools/objtool tests # the other toolchain
LLVM=1 make -C tools/objtool tests # and its binutils too
- tools/objtool/tests/run-tests.sh --keep basic # one test, keep its objects
+ make -C tools/objtool tests KEEP=all # keep every test's workdir
+ make -C tools/objtool tests KEEP=none # remove all workdirs
+
+ tools/objtool/tests/run-tests.sh basic # one test; failures kept by default
A run covers one compiler and one architecture; CI runs the combinations.
diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile
index 2c200d0..ed5cf14 100644
--- a/tools/objtool/Makefile
+++ b/tools/objtool/Makefile
@@ -153,7 +153,7 @@ mrproper: clean
tests: $(OBJTOOL)
$(Q)OBJTOOL=$(abspath $(OBJTOOL)) ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) \
- $(srctree)/tools/objtool/tests/run-tests.sh
+ KEEP=$(KEEP) $(srctree)/tools/objtool/tests/run-tests.sh
FORCE:
diff --git a/tools/objtool/tests/lib.sh b/tools/objtool/tests/lib.sh
index 294b99c..4da168d 100644
--- a/tools/objtool/tests/lib.sh
+++ b/tools/objtool/tests/lib.sh
@@ -163,8 +163,8 @@ workdir=
orig_obj=orig.o
patched_obj=patched.o
-pass() { echo "ok - $test_name${1:+: $1}"; exit 0; }
-fail() { echo "not ok - $test_name: $1"; exit 1; }
+pass() { KLP_TEST_REPORTED=1; echo "ok - $test_name${1:+: $1}"; exit 0; }
+fail() { KLP_TEST_FAILED=1; echo "not ok - $test_name: $*"; exit 1; }
# Two kinds of skip, and the runner tells them apart.
#
@@ -177,8 +177,19 @@ fail() { echo "not ok - $test_name: $1"; exit 1; }
#
# A bare skip() is neither, and the runner counts it as a failure: a test which
# gives up for a reason it never declared is a hole, not an outcome.
-declared_skip() { echo "ok - $test_name # SKIP (declared) $*"; exit 0; }
-probe_skip() { echo "ok - $test_name # SKIP (probe) $*"; exit 0; }
+declared_skip()
+{
+ KLP_TEST_REPORTED=1
+ echo "ok - $test_name # SKIP (declared) $*"
+ exit 0
+}
+
+probe_skip()
+{
+ KLP_TEST_REPORTED=1
+ echo "ok - $test_name # SKIP (probe) $*"
+ exit 0
+}
skip() { echo "ok - $test_name # SKIP $*"; exit 0; }
# TAP directives. A test which is known to fail reports it rather than being
@@ -187,26 +198,55 @@ skip() { echo "ok - $test_name # SKIP $*"; exit 0; }
# which is the point.
xfail()
{
+ KLP_TEST_REPORTED=1
echo "not ok - $test_name${1:+: $1} # TODO known failure"
exit 0
}
xpass()
{
+ KLP_TEST_FAILED=1
echo "ok - $test_name${1:+: $1} # TODO expected failure, but passed"
exit 1
}
+# cleanup [exit]
+#
+# Called with "exit" from the trap, when the test is over and what it built may
+# be worth keeping. Called bare by a test which has finished with one segment
+# and is about to setup() another: that one is done with, whatever the outcome
+# of the segments still to come, so it goes.
cleanup()
{
[ -n "$workdir" ] || return 0
- if [ -n "${KLP_TEST_KEEP:-}" ]; then
- [ -n "${KLP_TEST_WORKDIR:-}" ] || echo "# kept $workdir"
- return 0
- fi
-
- rm -rf "$workdir"
+ # run-tests.sh exports KLP_TEST_KEEP, having validated it; a test run on
+ # its own reads KEEP itself, so the same setting means the same thing
+ # either way.
+ case "${KLP_TEST_KEEP:-${KEEP:-failed}}" in
+ all) return 0 ;;
+ none) rm -rf "$workdir" ;;
+ failed|*)
+ [ "${1:-}" = exit ] || {
+ rm -rf "$workdir"
+ return 0
+ }
+ # Keep what the runner is going to point at. It counts as a
+ # failure anything which did not report an expected outcome --
+ # including a test which died before printing one, and an
+ # undeclared skip -- and none of those set KLP_TEST_FAILED, so
+ # the question to ask is whether a result was reported at all.
+ # An exit status cannot answer it: a test killed by a signal
+ # runs this trap with the status of whatever ran last.
+ [ -n "${KLP_TEST_REPORTED:-}" ] && [ -z "${KLP_TEST_FAILED:-}" ] && {
+ rm -rf "$workdir"
+ return 0
+ }
+ # run on its own there is no runner to say where it was kept
+ [ -n "${KLP_TEST_WORKDIR:-}" ] ||
+ echo "# kept $workdir"
+ ;;
+ esac
}
# setup [exported symbol...]
@@ -218,7 +258,7 @@ setup()
else
workdir="$(mktemp -d)" || fail "mktemp failed"
fi
- trap cleanup EXIT
+ trap 'cleanup exit' EXIT
export_syms "$@"
}
diff --git a/tools/objtool/tests/run-tests.sh b/tools/objtool/tests/run-tests.sh
index e6f1ac1..c0762f5 100755
--- a/tools/objtool/tests/run-tests.sh
+++ b/tools/objtool/tests/run-tests.sh
@@ -31,13 +31,15 @@ A test may be named with or without its "test-" prefix and ".sh" suffix, and is
looked for in both directories.
Options:
- -k, --keep do not delete each test's working directory; print its path,
- so the objects a failing test built can be looked at
+ -k, --keep same as KEEP=all (see below)
Environment:
OBJTOOL objtool binary to test (default ../objtool)
CC compiler used to build fixtures (default gcc)
ARCH architecture the tests are for (default: uname -m)
+ KEEP failed keep only failing tests (default)
+ all keep every test's working directory
+ none remove all working directories
A test which needs something of its own says so in its skip message.
EOF
@@ -46,16 +48,28 @@ EOF
cd "$(dirname "$0")" || exit 1
+keep_from_args=
while [ $# -gt 0 ]; do
case "$1" in
-h|--help) usage ;;
- -k|--keep) export KLP_TEST_KEEP=1; shift ;;
+ -k|--keep) keep_from_args=all; shift ;;
--) shift; break ;;
-*) echo "unknown option: $1" >&2; usage 1 ;;
*) break ;;
esac
done
+KLP_TEST_KEEP="${KEEP:-failed}"
+[ -n "$keep_from_args" ] && KLP_TEST_KEEP="$keep_from_args"
+case "$KLP_TEST_KEEP" in
+all|none|failed) ;;
+*)
+ echo "invalid KEEP=$KLP_TEST_KEEP (want failed, all, or none)" >&2
+ exit 1
+ ;;
+esac
+export KLP_TEST_KEEP
+
echo "TAP version 13"
# Sourcing the harness runs its preflight, which decides which architecture
@@ -109,9 +123,33 @@ fi
rundir="$(mktemp -d "${TMPDIR:-/tmp}/klp-tests.XXXXXXXX")" ||
{ echo "Bail out! cannot create a working directory" >&2; exit 1; }
+# The run's own two levels: each test's directory, and the one per source
+# directory holding them. Take them away if the tests left them empty, and
+# say so if they did not. Either rmdir may fail -- the glob stays unexpanded
+# when nothing was created -- so ask the directory itself rather than trusting
+# the status. Never rm -rf: what to keep is the tests' decision, made in
+# cleanup() as each one exits, and this must not overrule it.
+reap_rundir()
+{
+ rmdir "$rundir"/*/ 2>/dev/null
+ rmdir "$rundir" 2>/dev/null
+ [ -d "$rundir" ]
+}
+
+# An interrupted run has the same directory to answer for, and the tests it
+# never reached will not clean up on their way out. The one it was running
+# has, and under the default it kept what it had built, so say where.
+interrupted()
+{
+ reap_rundir && echo "# interrupted; what was built is in $rundir"
+ exit 130
+}
+trap interrupted INT TERM HUP
+
echo "1..${#tests[@]}"
pass=0 fail=0 static_skip=0 probe_skip=0 xfail=0 xpass=0
+failed_dirs=()
for t in "${tests[@]}"; do
out="$(KLP_TEST_WORKDIR="$rundir/${t%.sh}" ./"$t" 2>&1)"
@@ -147,16 +185,16 @@ for t in "${tests[@]}"; do
rest="$rest${rest:+$'\n'}was: $result"
result="not ok - $(basename "$t" .sh): undeclared skip"
result="$result (use gcc_only/clang_only or require_input_*)"
- fail=$((fail + 1)) ;;
+ fail=$((fail + 1)); failed_dirs+=( "$rundir/${t%.sh}" ) ;;
"not ok"*"# TODO"*) xfail=$((xfail + 1)) ;;
- "ok"*"# TODO"*) xpass=$((xpass + 1)) ;;
- "not ok"*) fail=$((fail + 1)) ;;
+ "ok"*"# TODO"*) xpass=$((xpass + 1)); failed_dirs+=( "$rundir/${t%.sh}" ) ;;
+ "not ok"*) fail=$((fail + 1)); failed_dirs+=( "$rundir/${t%.sh}" ) ;;
"ok"*) pass=$((pass + 1)) ;;
*)
# No result line at all: the test died before reporting.
rest="$rest${rest:+$'\n'}exited $rc without a result line"
result="not ok - $(basename "$t" .sh): no TAP result"
- fail=$((fail + 1)) ;;
+ fail=$((fail + 1)); failed_dirs+=( "$rundir/${t%.sh}" ) ;;
esac
echo "$result"
@@ -167,15 +205,35 @@ done
echo "# pass:$pass fail:$fail static-skip:$static_skip" \
"probe-skip:$probe_skip xfail:$xfail xpass:$xpass"
-# A failure is the one time the objects matter, and by default they are
-# already gone. Say so then rather than in the usage text nobody reads while
-# something is broken.
-if [ -n "${KLP_TEST_KEEP:-}" ]; then
- echo "# working directories kept in $rundir -- inspect, then rm -rf it"
-elif ! rmdir "$rundir"/*/ "$rundir" 2>/dev/null; then
- echo "# $rundir was not empty; a test did not clean up after itself"
-elif [ "$fail" != 0 ] || [ "$xpass" != 0 ]; then
- echo "# re-run with --keep to hold on to what a failing test built"
-fi
+case "$KLP_TEST_KEEP" in
+all)
+ echo "# keep=all: workdirs kept in $rundir"
+ echo "# inspect: diff.log, readelf -S out.o under each test-* subdirectory"
+ echo "# cleanup: rm -rf $rundir"
+ ;;
+failed)
+ if [ "${#failed_dirs[@]}" -gt 0 ]; then
+ echo "# keep=failed: ${#failed_dirs[@]} failing test(s) kept under $rundir:"
+ for d in "${failed_dirs[@]}"; do
+ echo "# ${d#"$rundir"/}/"
+ done
+ echo "# inspect: diff.log readelf -S out.o"
+ echo "# one test: $PWD/run-tests.sh <name>"
+ echo "# cleanup: rm -rf $rundir"
+ elif reap_rundir; then
+ echo "# $rundir was not empty;" \
+ "a test did not clean up after itself"
+ fi
+ ;;
+none)
+ if reap_rundir; then
+ echo "# $rundir was not empty;" \
+ "a test did not clean up after itself"
+ elif [ "$fail" != 0 ] || [ "$xpass" != 0 ]; then
+ echo "# keep=none: artifacts were removed" \
+ "(re-run with KEEP=failed or KEEP=all)"
+ fi
+ ;;
+esac
[ "$fail" = 0 ] && [ "$xpass" = 0 ]