[PATCH] perf-test: use command line arguments for directories

diff --git a/6c/69e0c950cf9ff4223052c472cc4d8acf300427 b/6c/69e0c950cf9ff4223052c472cc4d8acf300427
new file mode 100644 (file)
index 0000000..9d27354
--- /dev/null
+++ b/6c/69e0c950cf9ff4223052c472cc4d8acf300427
@@ -0,0 +1,94 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 1B10B431FAF\r
+       for <notmuch@notmuchmail.org>; Fri,  7 Mar 2014 04:05:49 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id nQL6S8QAfR4w for <notmuch@notmuchmail.org>;\r
+       Fri,  7 Mar 2014 04:05:43 -0800 (PST)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id A3ACD431FAE\r
+       for <notmuch@notmuchmail.org>; Fri,  7 Mar 2014 04:05:43 -0800 (PST)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1WLtX3-0006Ey-9w; Fri, 07 Mar 2014 08:05:41 -0400\r
+Received: (nullmailer pid 20366 invoked by uid 1000); Fri, 07 Mar 2014\r
+       12:05:37 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] perf-test: use command line arguments for directories\r
+Date: Fri,  7 Mar 2014 08:03:23 -0400\r
+Message-Id: <1394193803-20304-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.8.5.3\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 07 Mar 2014 12:05:49 -0000\r
+\r
+It seems that between version 1.26 and 1.27 of gnu tar, directories to\r
+be extracted read with --files-from are no longer recursively extacted.\r
+This patch puts them on the command line instead.\r
+---\r
+ performance-test/perf-test-lib.sh | 9 +++++----\r
+ 1 file changed, 5 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/performance-test/perf-test-lib.sh b/performance-test/perf-test-lib.sh\r
+index 44708cf..75e3d87 100644\r
+--- a/performance-test/perf-test-lib.sh\r
++++ b/performance-test/perf-test-lib.sh\r
+@@ -63,8 +63,9 @@ add_email_corpus ()\r
+     fi\r
+ \r
+     file_list=$(mktemp file_listXXXXXX)\r
++    declare -a extract_dirs\r
+     if [ ! -d "$TAG_CORPUS" ] ; then\r
+-      echo "notmuch-email-corpus/tags" >> $file_list\r
++      extract_dirs=("${extract_dirs[@]}" notmuch-email-corpus/tags)\r
+     fi\r
+ \r
+     if [ ! -d "$MAIL_CORPUS" ] ; then\r
+@@ -72,11 +73,11 @@ add_email_corpus ()\r
+           sed s,^,notmuch-email-corpus/, < \\r
+               ${TEST_DIRECTORY}/corpus/manifest/MANIFEST.${corpus_size} >> $file_list\r
+       else\r
+-          echo "notmuch-email-corpus/mail" >> $file_list\r
++          extract_dirs=("${extract_dirs[@]}" notmuch-email-corpus/mail)\r
+       fi\r
+     fi\r
+ \r
+-    if [[ -s $file_list ]]; then\r
++    if [[ -s $file_list || -n "${extract_dirs[*]}" ]]; then\r
+ \r
+       printf "Unpacking corpus\n"\r
+       tar --checkpoint=.5000 --extract --strip-components=1 \\r
+@@ -84,7 +85,7 @@ add_email_corpus ()\r
+           --use-compress-program ${XZ} \\r
+           --file ../download/notmuch-email-corpus-${PERFTEST_VERSION}.tar.xz \\r
+           --anchored --recursion \\r
+-          --files-from $file_list\r
++          --files-from $file_list "${extract_dirs[@]}"\r
+ \r
+       printf "\n"\r
+ \r
+-- \r
+1.8.5.3\r
+\r