X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=performance-test%2Fperf-test-lib.sh;h=56538abddcdbc1d8950f62a6f2d73fd1aa7d7dda;hp=44708cfd8d909581be77ee06a516c150c1d6154f;hb=2e16b051528b273e16306224f128b28d0091bc6a;hpb=2de8ce9b37bfaed7c5a962a5316dbc9c9c3cb2c8

diff --git a/performance-test/perf-test-lib.sh b/performance-test/perf-test-lib.sh
index 44708cfd..56538abd 100644
--- a/performance-test/perf-test-lib.sh
+++ b/performance-test/perf-test-lib.sh
@@ -1,4 +1,4 @@
-. ./version.sh
+. $(dirname "$0")/version.sh || exit 1
 
 corpus_size=large
 
@@ -25,12 +25,16 @@ do
 		echo "error: unknown performance test option '$1'" >&2; exit 1 ;;
 	esac
 done
-. ../test/test-lib-common.sh
+
+# Ensure NOTMUCH_SRCDIR and NOTMUCH_BUILDDIR are set.
+. $(dirname "$0")/../test/export-dirs.sh || exit 1
+
+. "$NOTMUCH_SRCDIR/test/test-lib-common.sh" || exit 1
 
 set -e
 
-if ! test -x ../notmuch
-then
+# It appears that people try to run tests without building...
+if [[ ! -x "$NOTMUCH_BUILDDIR/notmuch" ]]; then
 	echo >&2 'You do not seem to have built notmuch yet.'
 	exit 1
 fi
@@ -63,8 +67,9 @@ add_email_corpus ()
     fi
 
     file_list=$(mktemp file_listXXXXXX)
+    declare -a extract_dirs
     if [ ! -d "$TAG_CORPUS" ] ; then
-	echo "notmuch-email-corpus/tags" >> $file_list
+	extract_dirs=("${extract_dirs[@]}" notmuch-email-corpus/tags)
     fi
 
     if [ ! -d "$MAIL_CORPUS" ] ; then
@@ -72,11 +77,11 @@ add_email_corpus ()
 	    sed s,^,notmuch-email-corpus/, < \
 		${TEST_DIRECTORY}/corpus/manifest/MANIFEST.${corpus_size} >> $file_list
 	else
-	    echo "notmuch-email-corpus/mail" >> $file_list
+	    extract_dirs=("${extract_dirs[@]}" notmuch-email-corpus/mail)
 	fi
     fi
 
-    if [[ -s $file_list ]]; then
+    if [[ -s $file_list || -n "${extract_dirs[*]}" ]]; then
 
 	printf "Unpacking corpus\n"
 	tar --checkpoint=.5000 --extract --strip-components=1 \
@@ -84,7 +89,7 @@ add_email_corpus ()
 	    --use-compress-program ${XZ} \
 	    --file ../download/notmuch-email-corpus-${PERFTEST_VERSION}.tar.xz \
 	    --anchored --recursion \
-	    --files-from $file_list
+	    --files-from $file_list "${extract_dirs[@]}"
 
 	printf "\n"
 
@@ -148,7 +153,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
@@ -202,7 +207,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