[PATCH v9 3/6] selftests/ftrace: Fix requirement check of README file

[PATCH v9 3/6] selftests/ftrace: Fix requirement check of README file

[Steven Rostedt]

From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>

The selftest for ftrace checks some features by checking if the README has
text that states the feature is supported by that kernel. Unfortunately,
this check gives false positives because it many not be checked if there's
spaces in the string to check. This is due to the compare between the
required variable with the ":README" string stripped, because neither has
quotes around them.

Cc: Shuah Khan <shuah@kernel.org>
Cc: Shuah Khan <skhan@linuxfoundation.org>
Cc: linux-kselftest@vger.kernel.org
Cc: stable@vger.kernel.org
Fixes: 1b8eec510ba64 ("selftests/ftrace: Support ":README" suffix for requires")
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
 tools/testing/selftests/ftrace/test.d/functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/ftrace/test.d/functions b/tools/testing/selftests/ftrace/test.d/functions
index f68d336b961b..000fd05e84b1 100644
--- a/tools/testing/selftests/ftrace/test.d/functions
+++ b/tools/testing/selftests/ftrace/test.d/functions
@@ -137,7 +137,7 @@ check_requires() { # Check required files and tracers
                 echo "Required tracer $t is not configured."
                 exit_unsupported
             fi
-        elif [ $r != $i ]; then
+        elif [ "$r" != "$i" ]; then
             if ! grep -Fq "$r" README ; then
                 echo "Required feature pattern \"$r\" is not in README."
                 exit_unsupported
-- 
2.30.2

Re: [PATCH v9 3/6] selftests/ftrace: Fix requirement check of README file

[Masami Hiramatsu]

On Fri, 20 Aug 2021 16:46:47 -0400
Steven Rostedt <rostedt@goodmis.org> wrote:

> From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
> 
> The selftest for ftrace checks some features by checking if the README has
> text that states the feature is supported by that kernel. Unfortunately,
> this check gives false positives because it many not be checked if there's
> spaces in the string to check. This is due to the compare between the
> required variable with the ":README" string stripped, because neither has
> quotes around them.

Oops, good catch!

Acked-by: Masami Hiramatsu <mhiramat@kernel.org>

Thank you!

> 
> Cc: Shuah Khan <shuah@kernel.org>
> Cc: Shuah Khan <skhan@linuxfoundation.org>
> Cc: linux-kselftest@vger.kernel.org
> Cc: stable@vger.kernel.org
> Fixes: 1b8eec510ba64 ("selftests/ftrace: Support ":README" suffix for requires")
> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
> ---
>  tools/testing/selftests/ftrace/test.d/functions | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/testing/selftests/ftrace/test.d/functions b/tools/testing/selftests/ftrace/test.d/functions
> index f68d336b961b..000fd05e84b1 100644
> --- a/tools/testing/selftests/ftrace/test.d/functions
> +++ b/tools/testing/selftests/ftrace/test.d/functions
> @@ -137,7 +137,7 @@ check_requires() { # Check required files and tracers
>                  echo "Required tracer $t is not configured."
>                  exit_unsupported
>              fi
> -        elif [ $r != $i ]; then
> +        elif [ "$r" != "$i" ]; then
>              if ! grep -Fq "$r" README ; then
>                  echo "Required feature pattern \"$r\" is not in README."
>                  exit_unsupported
> -- 
> 2.30.2


-- 
Masami Hiramatsu <mhiramat@kernel.org>