| Message ID | 20200909211700.2399399-1-keescook@chromium.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d00451c8118f8f7ab8e057bc6ee2f8b7d70b6a1c |
| Headers | show |
| Series | [v2] selftests/lkdtm: Use "comm" instead of "diff" for dmesg | expand |
On 9/9/20 3:17 PM, Kees Cook wrote: > Instead of full GNU diff (which smaller boot environments may not have), > use "comm" which is more available. > > Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org> > Cc: Shuah Khan <shuah@kernel.org> > Cc: linux-kselftest@vger.kernel.org > Fixes: f131d9edc29d ("selftests/lkdtm: Don't clear dmesg when running tests") > Signed-off-by: Kees Cook <keescook@chromium.org> > --- > v2: add --nocheck-order, thanks to Joe Lawrence > v1: https://lore.kernel.org/lkml/202006261358.3E8AA623A9@keescook/ > --- > tools/testing/selftests/lkdtm/run.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/testing/selftests/lkdtm/run.sh b/tools/testing/selftests/lkdtm/run.sh > index 8383eb89d88a..bb7a1775307b 100755 > --- a/tools/testing/selftests/lkdtm/run.sh > +++ b/tools/testing/selftests/lkdtm/run.sh > @@ -82,7 +82,7 @@ dmesg > "$DMESG" > ($SHELL -c 'cat <(echo '"$test"') >'"$TRIGGER" 2>/dev/null) || true > > # Record and dump the results > -dmesg | diff --changed-group-format='%>' --unchanged-group-format='' "$DMESG" - > "$LOG" || true > +dmesg | comm --nocheck-order -13 "$DMESG" - > "$LOG" || true > > cat "$LOG" > # Check for expected output > Greg, Would you like me to take this through kselftest tree? If you want to take it through lkdtm tree, here is my Ack: Acked-by: Shuah Khan <skhan@linuxfoundation.org> thanks, -- Shuah
On Wed, Sep 09, 2020 at 03:35:00PM -0600, Shuah Khan wrote: > On 9/9/20 3:17 PM, Kees Cook wrote: > > Instead of full GNU diff (which smaller boot environments may not have), > > use "comm" which is more available. > > > > Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org> > > Cc: Shuah Khan <shuah@kernel.org> > > Cc: linux-kselftest@vger.kernel.org > > Fixes: f131d9edc29d ("selftests/lkdtm: Don't clear dmesg when running tests") > > Signed-off-by: Kees Cook <keescook@chromium.org> > > --- > > v2: add --nocheck-order, thanks to Joe Lawrence > > v1: https://lore.kernel.org/lkml/202006261358.3E8AA623A9@keescook/ > > --- > > tools/testing/selftests/lkdtm/run.sh | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/tools/testing/selftests/lkdtm/run.sh b/tools/testing/selftests/lkdtm/run.sh > > index 8383eb89d88a..bb7a1775307b 100755 > > --- a/tools/testing/selftests/lkdtm/run.sh > > +++ b/tools/testing/selftests/lkdtm/run.sh > > @@ -82,7 +82,7 @@ dmesg > "$DMESG" > > ($SHELL -c 'cat <(echo '"$test"') >'"$TRIGGER" 2>/dev/null) || true > > # Record and dump the results > > -dmesg | diff --changed-group-format='%>' --unchanged-group-format='' "$DMESG" - > "$LOG" || true > > +dmesg | comm --nocheck-order -13 "$DMESG" - > "$LOG" || true > > cat "$LOG" > > # Check for expected output > > > > Greg, > > Would you like me to take this through kselftest tree? > > If you want to take it through lkdtm tree, here is my Ack: > > Acked-by: Shuah Khan <skhan@linuxfoundation.org> Thanks, I'll take it. greg k-h
diff --git a/tools/testing/selftests/lkdtm/run.sh b/tools/testing/selftests/lkdtm/run.sh index 8383eb89d88a..bb7a1775307b 100755 --- a/tools/testing/selftests/lkdtm/run.sh +++ b/tools/testing/selftests/lkdtm/run.sh @@ -82,7 +82,7 @@ dmesg > "$DMESG" ($SHELL -c 'cat <(echo '"$test"') >'"$TRIGGER" 2>/dev/null) || true # Record and dump the results -dmesg | diff --changed-group-format='%>' --unchanged-group-format='' "$DMESG" - > "$LOG" || true +dmesg | comm --nocheck-order -13 "$DMESG" - > "$LOG" || true cat "$LOG" # Check for expected output
Instead of full GNU diff (which smaller boot environments may not have), use "comm" which is more available. Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org> Cc: Shuah Khan <shuah@kernel.org> Cc: linux-kselftest@vger.kernel.org Fixes: f131d9edc29d ("selftests/lkdtm: Don't clear dmesg when running tests") Signed-off-by: Kees Cook <keescook@chromium.org> --- v2: add --nocheck-order, thanks to Joe Lawrence v1: https://lore.kernel.org/lkml/202006261358.3E8AA623A9@keescook/ --- tools/testing/selftests/lkdtm/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)