[PATCH] selftests/ftrace: Fix check of return value in fgraph-retval.tc test

[PATCH] selftests/ftrace: Fix check of return value in fgraph-retval.tc test

[Steven Rostedt]

From: Steven Rostedt <rostedt@goodmis.org>

The addition of recording both the function name and return address to the
function graph tracer updated the selftest to check for "=-5" from "= -5".
But this causes the test to fail on certain configs, as "= -5" is still a
value that can be returned if function addresses are not enabled (older kernels).

Check for both "=-5" and " -5" as a success value.

Fixes: 21e92806d39c6 ("function_graph: Support recording and printing the function return address")
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---

Shuah, this update is only for changes in my tree, so you do not need to add it.

 tools/testing/selftests/ftrace/test.d/ftrace/fgraph-retval.tc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/ftrace/test.d/ftrace/fgraph-retval.tc b/tools/testing/selftests/ftrace/test.d/ftrace/fgraph-retval.tc
index e8e46378b88d..4307d4eef417 100644
--- a/tools/testing/selftests/ftrace/test.d/ftrace/fgraph-retval.tc
+++ b/tools/testing/selftests/ftrace/test.d/ftrace/fgraph-retval.tc
@@ -29,7 +29,7 @@ set -e
 
 : "Test printing the error code in signed decimal format"
 echo 0 > options/funcgraph-retval-hex
-count=`cat trace | grep 'proc_reg_write' | grep '=-5' | wc -l`
+count=`cat trace | grep 'proc_reg_write' | grep -e '=-5 ' -e '= -5 '  | wc -l`
 if [ $count -eq 0 ]; then
     fail "Return value can not be printed in signed decimal format"
 fi
-- 
2.45.2

Re: [PATCH] selftests/ftrace: Fix check of return value in fgraph-retval.tc test

[Shuah Khan]

On 10/11/24 11:20, Steven Rostedt wrote:
> From: Steven Rostedt <rostedt@goodmis.org>
> 
> The addition of recording both the function name and return address to the
> function graph tracer updated the selftest to check for "=-5" from "= -5".
> But this causes the test to fail on certain configs, as "= -5" is still a
> value that can be returned if function addresses are not enabled (older kernels).
> 
> Check for both "=-5" and " -5" as a success value.
> 
> Fixes: 21e92806d39c6 ("function_graph: Support recording and printing the function return address")
> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
> ---
> 
> Shuah, this update is only for changes in my tree, so you do not need to add it.

Noted. Thank you.

thanks,
-- Shuah