BusyBox diff doesn't support the GNU diff '--LTYPE-line-format' options that were used in the selftests to filter older kernel log messages from dmesg output.
Use "comm" which is more available in smaller boot environments.
Reported-by: Naresh Kamboju naresh.kamboju@linaro.org Signed-off-by: Joe Lawrence joe.lawrence@redhat.com ---
based-on: livepatching.git/for-5.9/selftests-cleanup merge-thru: livepatching.git
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 36648ca367c2..408529d94ddb 100644 --- a/tools/testing/selftests/livepatch/functions.sh +++ b/tools/testing/selftests/livepatch/functions.sh @@ -277,7 +277,7 @@ function check_result { # help differentiate repeated testing runs. Remove them with a # post-comparison sed filter.
- result=$(dmesg | diff --changed-group-format='%>' --unchanged-group-format='' "$SAVED_DMESG" - | \ + result=$(dmesg | comm -13 "$SAVED_DMESG" - | \ grep -e 'livepatch:' -e 'test_klp' | \ grep -v '(tainting|taints) kernel' | \ sed 's/^[[ 0-9.]*] //')
On 11/07/20 12:07 am, Joe Lawrence wrote:
BusyBox diff doesn't support the GNU diff '--LTYPE-line-format' options that were used in the selftests to filter older kernel log messages from dmesg output.
Use "comm" which is more available in smaller boot environments.
Reported-by: Naresh Kamboju naresh.kamboju@linaro.org Signed-off-by: Joe Lawrence joe.lawrence@redhat.com
LGTM. All the test passes on non-busybox environment.
Reviewed-by: Kamalesh Babulal kamalesh@linux.vnet.ibm.com
On Fri, Jul 10, 2020 at 2:39 PM Joe Lawrence joe.lawrence@redhat.com wrote:
BusyBox diff doesn't support the GNU diff '--LTYPE-line-format' options that were used in the selftests to filter older kernel log messages from dmesg output.
Use "comm" which is more available in smaller boot environments.
Reported-by: Naresh Kamboju naresh.kamboju@linaro.org Signed-off-by: Joe Lawrence joe.lawrence@redhat.com
based-on: livepatching.git/for-5.9/selftests-cleanup merge-thru: livepatching.git
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 36648ca367c2..408529d94ddb 100644 --- a/tools/testing/selftests/livepatch/functions.sh +++ b/tools/testing/selftests/livepatch/functions.sh @@ -277,7 +277,7 @@ function check_result { # help differentiate repeated testing runs. Remove them with a # post-comparison sed filter.
result=$(dmesg | diff --changed-group-format='%>' --unchanged-group-format='' "$SAVED_DMESG" - | \
result=$(dmesg | comm -13 "$SAVED_DMESG" - | \ grep -e 'livepatch:' -e 'test_klp' | \ grep -v '\(tainting\|taints\) kernel' | \ sed 's/^\[[ 0-9.]*\] //')-- 2.21.3
Reviewed-by: Yannick Cote ycote@redhat.com
On Fri 2020-07-10 14:37:45, Joe Lawrence wrote:
BusyBox diff doesn't support the GNU diff '--LTYPE-line-format' options that were used in the selftests to filter older kernel log messages from dmesg output.
Use "comm" which is more available in smaller boot environments.
Reported-by: Naresh Kamboju naresh.kamboju@linaro.org Signed-off-by: Joe Lawrence joe.lawrence@redhat.com
The patch is committed in livepatch.git, branch for-5.9/selftests-cleanup.
Best Regards, Petr
linux-kselftest-mirror@lists.linaro.org
-
Joe Lawrence -
Kamalesh Babulal -
Petr Mladek -
Yannick Cote