| Message ID | 20221010074207.714077-1-svens@linux.ibm.com |
|---|---|
| State | Accepted |
| Commit | cb05c81ada76a30a25a5f79b249375e33473af33 |
| Headers | show |
| Series | selftests/ftrace: fix dynamic_events dependency check | expand |
On Mon, 10 Oct 2022 09:42:07 +0200 Sven Schnelle <svens@linux.ibm.com> wrote: > commit 95c104c378dc ("tracing: Auto generate event name when creating a > group of events") changed the syntax in the ftrace README file which is > used by the selftests to check what features are support. Adjust the > string to make test_duplicates.tc and trigger-synthetic-eprobe.tc work > again. > > Fixes: 95c104c378dc ("tracing: Auto generate event name when creating a group of events") > Signed-off-by: Sven Schnelle <svens@linux.ibm.com> Acked-by: Steven Rostedt (Google) <rostedt@goodmis.org> -- Steve > --- > .../testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc | 2 +- > .../test.d/trigger/inter-event/trigger-synthetic-eprobe.tc | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tools/testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc b/tools/testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc > index db522577ff78..d3a79da215c8 100644 > --- a/tools/testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc > +++ b/tools/testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc > @@ -1,7 +1,7 @@ > #!/bin/sh > # SPDX-License-Identifier: GPL-2.0 > # description: Generic dynamic event - check if duplicate events are caught > -# requires: dynamic_events "e[:[<group>/]<event>] <attached-group>.<attached-event> [<args>]":README > +# requires: dynamic_events "e[:[<group>/][<event>]] <attached-group>.<attached-event> [<args>]":README > > echo 0 > events/enable > > diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-eprobe.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-eprobe.tc > index 914fe2e5d030..6461c375694f 100644 > --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-eprobe.tc > +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-eprobe.tc > @@ -1,7 +1,7 @@ > #!/bin/sh > # SPDX-License-Identifier: GPL-2.0 > # description: event trigger - test inter-event histogram trigger eprobe on synthetic event > -# requires: dynamic_events synthetic_events events/syscalls/sys_enter_openat/hist "e[:[<group>/]<event>] <attached-group>.<attached-event> [<args>]":README > +# requires: dynamic_events synthetic_events events/syscalls/sys_enter_openat/hist "e[:[<group>/][<event>]] <attached-group>.<attached-event> [<args>]":README > > echo 0 > events/enable >
Hi Sven, 2022年10月10日(月) 8:42 Sven Schnelle <svens@linux.ibm.com>: > > commit 95c104c378dc ("tracing: Auto generate event name when creating a > group of events") changed the syntax in the ftrace README file which is > used by the selftests to check what features are support. Adjust the > string to make test_duplicates.tc and trigger-synthetic-eprobe.tc work > again. > > Fixes: 95c104c378dc ("tracing: Auto generate event name when creating a group of events") > Signed-off-by: Sven Schnelle <svens@linux.ibm.com> Thanks for fixing it! Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> > --- > .../testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc | 2 +- > .../test.d/trigger/inter-event/trigger-synthetic-eprobe.tc | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tools/testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc b/tools/testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc > index db522577ff78..d3a79da215c8 100644 > --- a/tools/testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc > +++ b/tools/testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc > @@ -1,7 +1,7 @@ > #!/bin/sh > # SPDX-License-Identifier: GPL-2.0 > # description: Generic dynamic event - check if duplicate events are caught > -# requires: dynamic_events "e[:[<group>/]<event>] <attached-group>.<attached-event> [<args>]":README > +# requires: dynamic_events "e[:[<group>/][<event>]] <attached-group>.<attached-event> [<args>]":README > > echo 0 > events/enable > > diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-eprobe.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-eprobe.tc > index 914fe2e5d030..6461c375694f 100644 > --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-eprobe.tc > +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-eprobe.tc > @@ -1,7 +1,7 @@ > #!/bin/sh > # SPDX-License-Identifier: GPL-2.0 > # description: event trigger - test inter-event histogram trigger eprobe on synthetic event > -# requires: dynamic_events synthetic_events events/syscalls/sys_enter_openat/hist "e[:[<group>/]<event>] <attached-group>.<attached-event> [<args>]":README > +# requires: dynamic_events synthetic_events events/syscalls/sys_enter_openat/hist "e[:[<group>/][<event>]] <attached-group>.<attached-event> [<args>]":README > > echo 0 > events/enable > > -- > 2.34.1 >
diff --git a/tools/testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc b/tools/testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc index db522577ff78..d3a79da215c8 100644 --- a/tools/testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc +++ b/tools/testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc @@ -1,7 +1,7 @@ #!/bin/sh # SPDX-License-Identifier: GPL-2.0 # description: Generic dynamic event - check if duplicate events are caught -# requires: dynamic_events "e[:[<group>/]<event>] <attached-group>.<attached-event> [<args>]":README +# requires: dynamic_events "e[:[<group>/][<event>]] <attached-group>.<attached-event> [<args>]":README echo 0 > events/enable diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-eprobe.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-eprobe.tc index 914fe2e5d030..6461c375694f 100644 --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-eprobe.tc +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-eprobe.tc @@ -1,7 +1,7 @@ #!/bin/sh # SPDX-License-Identifier: GPL-2.0 # description: event trigger - test inter-event histogram trigger eprobe on synthetic event -# requires: dynamic_events synthetic_events events/syscalls/sys_enter_openat/hist "e[:[<group>/]<event>] <attached-group>.<attached-event> [<args>]":README +# requires: dynamic_events synthetic_events events/syscalls/sys_enter_openat/hist "e[:[<group>/][<event>]] <attached-group>.<attached-event> [<args>]":README echo 0 > events/enable
commit 95c104c378dc ("tracing: Auto generate event name when creating a group of events") changed the syntax in the ftrace README file which is used by the selftests to check what features are support. Adjust the string to make test_duplicates.tc and trigger-synthetic-eprobe.tc work again. Fixes: 95c104c378dc ("tracing: Auto generate event name when creating a group of events") Signed-off-by: Sven Schnelle <svens@linux.ibm.com> --- .../testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc | 2 +- .../test.d/trigger/inter-event/trigger-synthetic-eprobe.tc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)