test: split variable settings to their own file

[notmuch] / performance-test / perf-test-lib.sh

diff --git a/performance-test/perf-test-lib.sh b/performance-test/perf-test-lib.sh
index e7c502b6ca3d024aab87ab4d60d808fa8cf199df..0e4915e36b2ed7405be538f57d928d6d7628cee3 100644 (file)
--- a/performance-test/perf-test-lib.sh
+++ b/performance-test/perf-test-lib.sh
@@ -41,6 +41,8 @@ done
 # Ensure NOTMUCH_SRCDIR and NOTMUCH_BUILDDIR are set.
 . $(dirname "$0")/../test/export-dirs.sh || exit 1
 
+. "$NOTMUCH_SRCDIR/test/test-vars.sh" || exit 1
+
 # Where to run the tests
 TEST_DIRECTORY=$NOTMUCH_BUILDDIR/performance-test
 
@@ -212,7 +214,7 @@ time_run ()
 {
     printf "  %-22s" "$1"
     test_count=$(($test_count+1))
-    if test "$verbose" != "t"; then exec 4>test.output 3>&4; fi
+    if test "$verbose" != "t"; then exec 4>test.output 3>&4; else exec 3>&1; fi
     if [[ "$use_perf" = 1 ]]; then
        command_str="perf record --call-graph=${perf_callgraph} -o ${log_dir}/${test_count}.perf $2"
     else