| Message ID | 20220811212138.182575-1-joe.lawrence@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 857300b7d5fd5ee4549cf687cd9b46eeb1663b5b |
| Headers | show |
| Series | selftests/livepatch: normalize sysctl error message | expand |
On 8/12/22 02:51, Joe Lawrence wrote: > 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 <denli@redhat.com> > Signed-off-by: Joe Lawrence <joe.lawrence@redhat.com> Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> > --- > tools/testing/selftests/livepatch/functions.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/testing/selftests/livepatch/functions.sh b/tools/testing/selftests/livepatch/functions.sh > index 9230b869371d..d5001c9eb72e 100644 > --- a/tools/testing/selftests/livepatch/functions.sh > +++ b/tools/testing/selftests/livepatch/functions.sh > @@ -86,7 +86,7 @@ function set_ftrace_enabled() { > > if [[ "$result" != "$1" ]] ; then > if [[ $can_fail -eq 1 ]] ; then > - echo "livepatch: $err" > /dev/kmsg > + echo "livepatch: $err" | sed 's#/proc/sys/kernel/#kernel.#' > /dev/kmsg > return > fi >
On Thu 2022-08-11 17:21:38, Joe Lawrence wrote: > 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 <denli@redhat.com> > Signed-off-by: Joe Lawrence <joe.lawrence@redhat.com> JFYI, the patch has been committed into livepatching.git, branch for-6.1/fixes. Best Regards, Petr
diff --git a/tools/testing/selftests/livepatch/functions.sh b/tools/testing/selftests/livepatch/functions.sh index 9230b869371d..d5001c9eb72e 100644 --- a/tools/testing/selftests/livepatch/functions.sh +++ b/tools/testing/selftests/livepatch/functions.sh @@ -86,7 +86,7 @@ function set_ftrace_enabled() { if [[ "$result" != "$1" ]] ; then if [[ $can_fail -eq 1 ]] ; then - echo "livepatch: $err" > /dev/kmsg + echo "livepatch: $err" | sed 's#/proc/sys/kernel/#kernel.#' > /dev/kmsg return fi
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 <denli@redhat.com> Signed-off-by: Joe Lawrence <joe.lawrence@redhat.com> --- tools/testing/selftests/livepatch/functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)