Commit f6ff4bfb authored by Zheng Yejian's avatar Zheng Yejian Committed by sanglipeng
Browse files

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

stable inclusion
from stable-v5.10.166
commit 7fe4fab870613f912662efd9cc88fa588e8d5696
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7TH9O

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=7fe4fab870613f912662efd9cc88fa588e8d5696

--------------------------------

This reverts commit 31c2e369b5335d70e913afee3ae11e54d61afef2 which is commit
b5734e99 upstream.

The reverted commit belongs to patchset which updated synthetic event
command parsing and testcase 'trigger-synthetic_event_syntax_errors.tc'
Link: https://lore.kernel.org/all/20210211020950.102294806@goodmis.org/



However this testcase update was backported alone without feature
update, which makes the testcase cannot pass on stable branch.

Revert this commit to make the testcase correct.

Fixes: 31c2e369b533 ("selftests/ftrace: Update synthetic event syntax errors")
Reported-by: default avatarChen Zhongjin <chenzhongjin@huawei.com>
Signed-off-by: default avatarZheng Yejian <zhengyejian1@huawei.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent eda23c3a

tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic_event_syntax_errors.tc

+8 −27
Original line number Diff line number Diff line 
#!/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