ACK: [SRU J][PATCH] UBUNTU: SAUCE: Fix ftrace/Meta-selftests bashism check

Masahiro Yamada masahiro.yamada at canonical.com
Tue Feb 28 12:37:58 UTC 2023


On Tue, Feb 28, 2023 at 7:18 PM Roxana Nicolescu
<roxana.nicolescu at canonical.com> wrote:
>
>
> On 28-02-2023 10:31, Stefan Bader wrote:
> > BugLink: https://bugs.launchpad.net/bugs/2006453
> >
> > Upstream commit a1d6cd88c897 "selftests/ftrace: event_triggers: wait longer for
> > test_event_enable" introduces a test which is considered a bashism and
> > as a result causes the Meta-selftests subtest to fail.  Fix up the "=="
> > to be "=" in order to avoid this.
> >
> > Fixes: a1d6cd88c897 "selftests/ftrace: event_triggers: wait longer for test_event_enable"
> > Signed-off-by: Stefan Bader <stefan.bader at canonical.com>
> > ---
> >
> > The same upstream stable fix now also causes the bashism check in Jammy
> > to fail (was Focal before).
> >
> > -Stefan
> >
> >   .../selftests/ftrace/test.d/ftrace/func_event_triggers.tc       | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc b/tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc
> > index 27a68bbe778b..d9b812795077 100644
> > --- a/tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc
> > +++ b/tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc
> > @@ -42,7 +42,7 @@ test_event_enabled() {
> >
> >       while [ $check_times -ne 0 ]; do
> >       e=`cat $EVENT_ENABLE`
> > -     if [ "$e" == $val ]; then
> > +     if [ "$e" = $val ]; then
> >           return 0
> >       fi
> >       sleep $SLEEP_TIME
>
> Small question: Did we push the fix in upstream as well?


The upstream was already fixed in the same way.


Dropping "UBUNTU: SAUCE:" and having the following tag
would be better.


commit 1e6b485c922fbedf41d5a9f4e6449c5aeb923a32 upstream.











>
> Acked-by: Roxana Nicolescu <roxana.nicolescu at canonical.com>
>
> --
> kernel-team mailing list
> kernel-team at lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team



More information about the kernel-team mailing list