UBUNTU: SAUCE: Revert "selftests/ftrace: Update synthetic event syntax errors"

BugLink: https://bugs.launchpad.net/bugs/1925539
This reverts commit da5eb9adef3d67b195d84b15e91d30c56b454d7c.

The ftrace synthetic event infrastructure has been reworked recently so
also the corresponding selftest has been updated. However, in 5.11 we
only got the update of the test case without the required commits for
the reworked syntax in the kernel.

For this reason the ftrace synthetic event test is failing. Revert the
commit that introduced the change in the test case, reverting the
previous behavior.

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
Acked-by: Colin King <colin.king@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

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 955e3ceea44b5b0a3b191eb8f64b4c44ac53707f..ada594fe16cb3a83a2d46a62a65da1aed106c32d 100644 (file)
--- 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,38 +1,19 @@
 #!/bin/sh
 # SPDX-License-Identifier: GPL-2.0
 # description: event trigger - test synthetic_events syntax parser errors
-# requires: synthetic_events error_log "char name[]' >> synthetic_events":README
+# requires: synthetic_events error_log
 
 check_error() { # command-with-error-pos-by-^
     ftrace_errlog_check 'synthetic_events' "$1" 'synthetic_events'
 }
 
-check_dyn_error() { # command-with-error-pos-by-^
-    ftrace_errlog_check 'synthetic_events' "$1" 'dynamic_events'
-}
-
 check_error 'myevent ^chr arg'                 # INVALID_TYPE
-check_error 'myevent ^unsigned arg'            # INCOMPLETE_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;^[]'             # INVALID_FIELD
-check_error 'myevent char str; ^int'           # INVALID_FIELD
-
-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
-
-check_error '^mye;vent char str[]'             # INVALID_CMD
-check_error '^myevent ; char str[]'            # INVALID_CMD
-check_error '^myevent; char str[]'             # INVALID_CMD
-check_error '^myevent ;char str[]'             # INVALID_CMD
-check_error '^; char str[]'                    # INVALID_CMD
-check_error '^;myevent char str[]'             # INVALID_CMD
-check_error '^myevent'                         # INVALID_CMD
-
-check_dyn_error '^s:junk/myevent char str['    # INVALID_DYN_CMD
+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 '^myevent'                         # INCOMPLETE_CMD
 
 exit 0