profiling: accept parameters & show actual command lines

profiling/ls.bash

@@ -8,8 +8,10 @@ cd "$(dirname "$0")"
 T=$(mktemp -d)
 mkdir "$T/a" "$T/b"
 
-../gocryptfs -init -quiet -scryptn 10 -extpass "echo test" "$T/a"
-../gocryptfs -quiet -nosyslog -extpass "echo test" "$T/a" "$T/b"
+set -x
+../gocryptfs -init -quiet -scryptn 10 -extpass "echo test" "$@" "$T/a"
+{ set +x ; } 2> /dev/null
+../gocryptfs -quiet -nosyslog -extpass "echo test" "$@" "$T/a" "$T/b"
 
 # Cleanup trap
 trap "cd /; fusermount -u -z $T/b; rm -Rf $T/a" EXIT
@@ -24,8 +26,10 @@ echo "done, $SECONDS seconds"
 
 echo "Remount..."
 fusermount -u "$T/b"
+set -x
 ../gocryptfs -quiet -nosyslog -extpass "echo test" -cpuprofile "$T/cprof" -memprofile "$T/mprof" \
-	"$T/a" "$T/b"
+	"$@" "$T/a" "$T/b"
+{ set +x ; } 2> /dev/null
 
 echo "Running ls under profiler (3x)..."
 for i in 1 2 3; do

profiling/streaming-read.bash

@@ -5,8 +5,10 @@ cd "$(dirname "$0")"
 T=$(mktemp -d)
 mkdir "$T/a" "$T/b"
 
-../gocryptfs -init -quiet -scryptn 10 -extpass "echo test" "$T/a"
-../gocryptfs -quiet -extpass "echo test" "$T/a" "$T/b"
+set -x
+../gocryptfs -init -quiet -scryptn 10 -extpass "echo test" "$@" "$T/a"
+{ set +x ; } 2> /dev/null
+../gocryptfs -quiet -extpass "echo test" "$@" "$T/a" "$T/b"
 
 # Cleanup trap
 trap "cd /; fusermount -u -z $T/b; rm -Rf $T/a" EXIT
@@ -16,8 +18,10 @@ dd if=/dev/zero of="$T/b/zero" bs=1M count=100 status=none
 
 # Remount with profiling
 fusermount -u "$T/b"
+set -x
 ../gocryptfs -quiet -extpass "echo test" -cpuprofile "$T/cprof" -memprofile "$T/mprof" \
-	"$T/a" "$T/b"
+	 "$@" "$T/a" "$T/b"
+{ set +x ; } 2> /dev/null
 
 # Read 10 x 100MB instead of 1 x 1GB to keep the used disk space low
 for i in $(seq 1 10); do

profiling/streaming-write.bash

@@ -5,9 +5,11 @@ cd "$(dirname "$0")"
 T=$(mktemp -d)
 mkdir "$T/a" "$T/b"
 
-../gocryptfs -init -quiet -scryptn 10 -extpass "echo test" "$T/a"
+set -x
+../gocryptfs -init -quiet -scryptn 10 -extpass "echo test" "$@" "$T/a"
 ../gocryptfs -quiet -extpass "echo test" -cpuprofile "$T/cprof" -memprofile "$T/mprof" \
-	"$T/a" "$T/b"
+	"$@" "$T/a" "$T/b"
+{ set +x ; } 2> /dev/null
 
 # Cleanup trap
 trap "cd /; fusermount -u -z $T/b; rm -Rf $T/a" EXIT

profiling/tar-extract.bash

@@ -8,9 +8,11 @@ cd "$(dirname "$0")"
 T=$(mktemp -d)
 mkdir "$T/a" "$T/b"
 
-../gocryptfs -init -quiet -scryptn 10 -extpass "echo test" "$T/a"
+set -x
+../gocryptfs -init -quiet -scryptn 10 -extpass "echo test" "$@" "$T/a"
 ../gocryptfs -quiet -extpass "echo test" -cpuprofile "$T/cprof" -memprofile "$T/mprof" \
-	"$T/a" "$T/b"
+	"$@" "$T/a" "$T/b"
+{ set +x ; } 2> /dev/null
 
 # Cleanup trap
 trap "cd /; fusermount -u -z $T/b; rm -Rf $T/a" EXIT

profiling/write-trace.bash

@@ -8,9 +8,11 @@ cd "$(dirname "$0")"
 T=$(mktemp -d)
 mkdir "$T/a" "$T/b"
 
-../gocryptfs -init -quiet -scryptn 10 -extpass "echo test" "$T/a"
+set -x
+../gocryptfs -init -quiet -scryptn 10 -extpass "echo test" "$@" "$T/a"
 ../gocryptfs -quiet -extpass "echo test" -trace "$T/trace" \
-	"$T/a" "$T/b"
+	"$@" "$T/a" "$T/b"
+{ set +x ; } 2> /dev/null
 
 # Cleanup trap
 trap "cd /; fusermount -u -z $T/b; rm -Rf $T/a" EXIT