Some of the synthetic event errors and positions have changed in the
code - update those and add several more tests.

Also add a runtime check to ensure that the kernel supports dynamic
strings in synthetic events, which these tests require.

Fixes: 81ff92a93d95 (selftests/ftrace: Add test case for synthetic
event syntax errors)

Reported-by: Masami Hiramatsu <mhira...@kernel.org>
Signed-off-by: Tom Zanussi <zanu...@kernel.org>
---
 .../trigger-synthetic_event_syntax_errors.tc    | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git 
a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic_event_syntax_errors.tc
 
b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic_event_syntax_errors.tc
index ada594fe16cb..ebdc7c0a75a1 100644
--- 
a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic_event_syntax_errors.tc
+++ 
b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic_event_syntax_errors.tc
@@ -1,19 +1,22 @@
 #!/bin/sh
 # SPDX-License-Identifier: GPL-2.0
 # description: event trigger - test synthetic_events syntax parser errors
-# requires: synthetic_events error_log
+# requires: synthetic_events error_log "char name[]' >> 
synthetic_events":README
 
 check_error() { # command-with-error-pos-by-^
     ftrace_errlog_check 'synthetic_events' "$1" 'synthetic_events'
 }
 
 check_error 'myevent ^chr arg'                 # INVALID_TYPE
-check_error 'myevent ^char str[];; int v'      # INVALID_TYPE
-check_error 'myevent char ^str]; int v'                # INVALID_NAME
-check_error 'myevent char ^str;[]'             # INVALID_NAME
-check_error 'myevent ^char str[; int v'                # INVALID_TYPE
-check_error '^mye;vent char str[]'             # BAD_NAME
-check_error 'myevent char str[]; ^int'         # INVALID_FIELD
+check_error 'mye;^vent char str[]'             # INVALID_TYPE
+check_error 'myevent char ^str]; int v'                # BAD_NAME
+check_error '^mye-vent char str[]'             # BAD_NAME
+check_error 'myevent char ^st-r[]'             # BAD_NAME
+check_error 'myevent char str;^[]'             # INCOMPLETE_CMD
+check_error 'myevent char str[]; ^int'         # INCOMPLETE_CMD
 check_error '^myevent'                         # INCOMPLETE_CMD
+check_error 'myevent char ^str[; int v'                # INVALID_ARRAY_SPEC
+check_error 'myevent char ^str[kdjdk]'         # INVALID_ARRAY_SPEC
+check_error 'myevent char ^str[257]'           # INVALID_ARRAY_SPEC
 
 exit 0
-- 
2.17.1

Reply via email to