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

Stefan Bader stefan.bader at canonical.com
Wed Mar 1 10:19:22 UTC 2023


On 28.02.23 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>
> ---

Applied the upstream cherry pick to jammy:linux/master-next. Thanks.

-Stefan

Commit: 1e6b485c922fbedf41d5a9f4e6449c5aeb923a32
Author: Masami Hiramatsu (Google) <mhiramat at kernel.org>
Date: Sun Jan 22 08:32:50 2023 +0900

     selftests/ftrace: Fix bash specific "==" operator

>
> 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

-- 
- Stefan

-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_0xE8675DEECBEECEA3.asc
Type: application/pgp-keys
Size: 44613 bytes
Desc: OpenPGP public key
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20230301/a2838705/attachment-0001.key>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20230301/a2838705/attachment-0001.sig>


More information about the kernel-team mailing list