diff mbox series

testrun.sh: Support passing strace and valgrind arguments

Message ID 87bkvbxdwi.fsf@oldenburg.str.redhat.com
State New
Headers show
Series testrun.sh: Support passing strace and valgrind arguments | expand

Commit Message

Florian Weimer June 2, 2022, 3:50 p.m. UTC
This is a bit of a hack, but it works quite well in practice.

---
 Makefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Comments

Adhemerval Zanella Netto June 2, 2022, 4:31 p.m. UTC | #1
On 02/06/2022 12:50, Florian Weimer via Libc-alpha wrote:
> This is a bit of a hack, but it works quite well in practice.
> 

LGTM, thanks.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

> ---
>  Makefile | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index b1454882bd..a9722a161c 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -143,7 +143,8 @@ Usage: $$0 [OPTIONS] <program> [ARGUMENTS...]
>  
>    --tool=TOOL  Run with the specified TOOL. It can be strace, rpctrace,
>                 valgrind or container. The container will run within
> -               support/test-container.
> +               support/test-container.  For strace and valgrind,
> +               additional arguments can be passed after the tool name.
>  EOF
>  
>    exit 1
> @@ -174,16 +175,16 @@ case "$$toolname" in
>      exec $(subst $(common-objdir),"$${builddir}", $(test-program-prefix)) \
>        $${1+"$$@"}
>      ;;
> -  strace)
> -    exec strace $(patsubst %, -E%, $(run-program-env)) \
> +  strace*)
> +    exec $$toolname $(patsubst %, -E%, $(run-program-env)) \
>        $(test-via-rtld-prefix) $${1+"$$@"}
>      ;;
>    rpctrace)
>      exec rpctrace $(patsubst %, -E%, $(run-program-env)) \
>        $(test-via-rtld-prefix) $${1+"$$@"}
>      ;;
> -  valgrind)
> -    exec env $(run-program-env) valgrind $(test-via-rtld-prefix) $${1+"$$@"}
> +  valgrind*)
> +    exec env $(run-program-env) $$toolname $(test-via-rtld-prefix) $${1+"$$@"}
>      ;;
>    container)
>      exec env $(run-program-env) $(test-via-rtld-prefix) \
>
diff mbox series

Patch

diff --git a/Makefile b/Makefile
index b1454882bd..a9722a161c 100644
--- a/Makefile
+++ b/Makefile
@@ -143,7 +143,8 @@  Usage: $$0 [OPTIONS] <program> [ARGUMENTS...]
 
   --tool=TOOL  Run with the specified TOOL. It can be strace, rpctrace,
                valgrind or container. The container will run within
-               support/test-container.
+               support/test-container.  For strace and valgrind,
+               additional arguments can be passed after the tool name.
 EOF
 
   exit 1
@@ -174,16 +175,16 @@  case "$$toolname" in
     exec $(subst $(common-objdir),"$${builddir}", $(test-program-prefix)) \
       $${1+"$$@"}
     ;;
-  strace)
-    exec strace $(patsubst %, -E%, $(run-program-env)) \
+  strace*)
+    exec $$toolname $(patsubst %, -E%, $(run-program-env)) \
       $(test-via-rtld-prefix) $${1+"$$@"}
     ;;
   rpctrace)
     exec rpctrace $(patsubst %, -E%, $(run-program-env)) \
       $(test-via-rtld-prefix) $${1+"$$@"}
     ;;
-  valgrind)
-    exec env $(run-program-env) valgrind $(test-via-rtld-prefix) $${1+"$$@"}
+  valgrind*)
+    exec env $(run-program-env) $$toolname $(test-via-rtld-prefix) $${1+"$$@"}
     ;;
   container)
     exec env $(run-program-env) $(test-via-rtld-prefix) \