Skip to content

Commit 857300b

Browse files
joe-lawrencepmladek
authored andcommitted
selftests/livepatch: normalize sysctl error message
The livepatch kselftests rely on comparing expected and actual output from such commands as sysctl. A recent commit in procps-ng v4.0.0 [1] changed sysctl's output to emit key pathnames like: sysctl: setting key "/proc/sys/kernel/ftrace_enabled": Device or resource busy versus previous dotted output: sysctl: setting key "kernel.ftrace_enabled": Device or resource busy The modification in output was later reverted [2], but since the change has been tagged in procps-ng v4.0.0, update the livepatch kselftest to handle either case. [1] https://gitlab.com/procps-ng/procps/-/commit/6389deca5bf667f5fab5912acde78ba8e0febbc7 [2] https://gitlab.com/procps-ng/procps/-/commit/b159c198c9160a8eb13254e2b631d0035b9b542c Reported-by: Dennis(Zhuoheng) Li <[email protected]> Signed-off-by: Joe Lawrence <[email protected]> Reviewed-by: Kamalesh Babulal <[email protected]> Signed-off-by: Petr Mladek <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 66d8529 commit 857300b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

tools/testing/selftests/livepatch/functions.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ function set_ftrace_enabled() {
8686

8787
if [[ "$result" != "$1" ]] ; then
8888
if [[ $can_fail -eq 1 ]] ; then
89-
echo "livepatch: $err" > /dev/kmsg
89+
echo "livepatch: $err" | sed 's#/proc/sys/kernel/#kernel.#' > /dev/kmsg
9090
return
9191
fi
9292

0 commit comments

Comments
 (0)