Merge branch 'release'

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

diff --git a/performance-test/perf-test-lib.sh b/performance-test/perf-test-lib.sh
index 44708cfd8d909581be77ee06a516c150c1d6154f..00d2f1c6050bb7330bba19e4a17a7bbe097cae42 100644 (file)
--- 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
 
@@ -63,8 +63,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 +73,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 +85,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"
 
@@ -202,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