X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=performance-test%2Fperf-test-lib.sh;h=c89d5aab39a069e7ee28596b3f20ea0e7a8803ed;hb=427fa5e6e66eb238783f6cace56cbdcafc9c648d;hp=75e3d8787ad6db09aeda709707950f5be839468f;hpb=8fcc3260a9a936de72d755e61d93d5a24380e8b7;p=notmuch

diff --git a/performance-test/perf-test-lib.sh b/performance-test/perf-test-lib.sh
index 75e3d878..c89d5aab 100644
--- a/performance-test/perf-test-lib.sh
+++ b/performance-test/perf-test-lib.sh
@@ -1,4 +1,4 @@
-. ./version.sh
+. ./version.sh || exit 1
 
 corpus_size=large
 
@@ -25,7 +25,7 @@ do
 		echo "error: unknown performance test option '$1'" >&2; exit 1 ;;
 	esac
 done
-. ../test/test-lib-common.sh
+. ../test/test-lib-common.sh || exit 1
 
 set -e
 
@@ -149,7 +149,7 @@ memory_run ()
 
     printf "[ %d ]\t%s\n" $test_count "$1"
 
-    NOTMUCH_TALLOC_REPORT="$talloc_log" valgrind --leak-check=full --log-file="$log_file" $2
+    NOTMUCH_TALLOC_REPORT="$talloc_log" eval "valgrind --leak-check=full --log-file='$log_file' $2"
 
     awk '/LEAK SUMMARY/,/suppressed/ { sub(/^==[0-9]*==/," "); print }' "$log_file"
     echo
@@ -203,7 +203,7 @@ time_done ()
     fi
 }
 
-cd -P "$test" || error "Cannot setup test environment"
+cd -P "$test" || error "Cannot set up test environment"
 test_failure=0
 test_count=0