From 2e16b051528b273e16306224f128b28d0091bc6a Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Mon, 25 Sep 2017 23:38:24 +0300 Subject: [PATCH] perf-test: use source and build paths in perf-test-lib.sh Make a distinction between source and build directories. --- performance-test/perf-test-lib.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/performance-test/perf-test-lib.sh b/performance-test/perf-test-lib.sh index c89d5aab..56538abd 100644 --- a/performance-test/perf-test-lib.sh +++ b/performance-test/perf-test-lib.sh @@ -1,4 +1,4 @@ -. ./version.sh || exit 1 +. $(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 || exit 1 + +# 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