Mesa (master): intel/gpu_dump: fix argument passing

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 17898a9b7e0cd3bfc95c186586e5cafa1e3a2c9d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=17898a9b7e0cd3bfc95c186586e5cafa1e3a2c9d

Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Sat Jun  8 23:48:02 2019 +0300

intel/gpu_dump: fix argument passing

We were dropping "/' around arguments grouped together.
This was triggering failures with :

   $ ./framemetrics -g "Memory Writes Distribution Gen9" -o /tmp/output.csv -f ./my.trace 10 11

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Eric Engestrom <eric at engestrom.ch>

---

 src/intel/tools/intel_dump_gpu.in     | 4 ++--
 src/intel/tools/intel_sanitize_gpu.in | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/intel/tools/intel_dump_gpu.in b/src/intel/tools/intel_dump_gpu.in
index a4ceaba7090..f9fed66c1e3 100755
--- a/src/intel/tools/intel_dump_gpu.in
+++ b/src/intel/tools/intel_dump_gpu.in
@@ -115,9 +115,9 @@ tmp_file=`mktemp`
 echo -e $args > $tmp_file
 
 if [ -z $gdb ]; then
-    LD_PRELOAD="$ld_preload" INTEL_DUMP_GPU_CONFIG=$tmp_file $@
+    LD_PRELOAD="$ld_preload" INTEL_DUMP_GPU_CONFIG=$tmp_file "$@"
 else
-    gdb -iex "set exec-wrapper env LD_PRELOAD=$ld_preload INTEL_DUMP_GPU_CONFIG=$tmp_file" --args $@
+    gdb -iex "set exec-wrapper env LD_PRELOAD=$ld_preload INTEL_DUMP_GPU_CONFIG=$tmp_file" --args "$@"
 fi
 
 ret=$?
diff --git a/src/intel/tools/intel_sanitize_gpu.in b/src/intel/tools/intel_sanitize_gpu.in
index a5b032abc6d..912387ae656 100755
--- a/src/intel/tools/intel_sanitize_gpu.in
+++ b/src/intel/tools/intel_sanitize_gpu.in
@@ -53,5 +53,5 @@ ld_preload="@install_libexecdir@/libintel_sanitize_gpu.so${LD_PRELOAD:+:$LD_PREL
 if [ -z $gdb ]; then
     LD_PRELOAD=$ld_preload exec "$@"
 else
-    gdb -iex "set exec-wrapper env LD_PRELOAD=$ld_preload" --args $@
+    gdb -iex "set exec-wrapper env LD_PRELOAD=$ld_preload" --args "$@"
 fi