From: David Bremner <david@tethera.net>
Date: Fri, 7 Mar 2014 12:03:23 +0000 (-0400)
Subject: perf-test: use command line arguments for directories
X-Git-Tag: 0.18_rc0~90
X-Git-Url: https://git.cworth.org/git?p=notmuch;a=commitdiff_plain;h=8fcc3260a9a936de72d755e61d93d5a24380e8b7

perf-test: use command line arguments for directories

It seems that between version 1.26 and 1.27 of gnu tar, directories to
be extracted read with --files-from are no longer recursively extacted.
This patch puts them on the command line instead.
---

diff --git a/performance-test/perf-test-lib.sh b/performance-test/perf-test-lib.sh
index 44708cfd..75e3d878 100644
--- a/performance-test/perf-test-lib.sh
+++ b/performance-test/perf-test-lib.sh
@@ -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"