1 Return-Path: <bremner@tethera.net>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 1B10B431FAF
\r
6 for <notmuch@notmuchmail.org>; Fri, 7 Mar 2014 04:05:49 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id nQL6S8QAfR4w for <notmuch@notmuchmail.org>;
\r
16 Fri, 7 Mar 2014 04:05:43 -0800 (PST)
\r
17 Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])
\r
18 (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id A3ACD431FAE
\r
21 for <notmuch@notmuchmail.org>; Fri, 7 Mar 2014 04:05:43 -0800 (PST)
\r
22 Received: from remotemail by yantan.tethera.net with local (Exim 4.80)
\r
23 (envelope-from <bremner@tethera.net>)
\r
24 id 1WLtX3-0006Ey-9w; Fri, 07 Mar 2014 08:05:41 -0400
\r
25 Received: (nullmailer pid 20366 invoked by uid 1000); Fri, 07 Mar 2014
\r
27 From: David Bremner <david@tethera.net>
\r
28 To: notmuch@notmuchmail.org
\r
29 Subject: [PATCH] perf-test: use command line arguments for directories
\r
30 Date: Fri, 7 Mar 2014 08:03:23 -0400
\r
31 Message-Id: <1394193803-20304-1-git-send-email-david@tethera.net>
\r
32 X-Mailer: git-send-email 1.8.5.3
\r
33 X-BeenThere: notmuch@notmuchmail.org
\r
34 X-Mailman-Version: 2.1.13
\r
36 List-Id: "Use and development of the notmuch mail system."
\r
37 <notmuch.notmuchmail.org>
\r
38 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
39 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
40 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
41 List-Post: <mailto:notmuch@notmuchmail.org>
\r
42 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
43 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
44 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
45 X-List-Received-Date: Fri, 07 Mar 2014 12:05:49 -0000
\r
47 It seems that between version 1.26 and 1.27 of gnu tar, directories to
\r
48 be extracted read with --files-from are no longer recursively extacted.
\r
49 This patch puts them on the command line instead.
\r
51 performance-test/perf-test-lib.sh | 9 +++++----
\r
52 1 file changed, 5 insertions(+), 4 deletions(-)
\r
54 diff --git a/performance-test/perf-test-lib.sh b/performance-test/perf-test-lib.sh
\r
55 index 44708cf..75e3d87 100644
\r
56 --- a/performance-test/perf-test-lib.sh
\r
57 +++ b/performance-test/perf-test-lib.sh
\r
58 @@ -63,8 +63,9 @@ add_email_corpus ()
\r
61 file_list=$(mktemp file_listXXXXXX)
\r
62 + declare -a extract_dirs
\r
63 if [ ! -d "$TAG_CORPUS" ] ; then
\r
64 - echo "notmuch-email-corpus/tags" >> $file_list
\r
65 + extract_dirs=("${extract_dirs[@]}" notmuch-email-corpus/tags)
\r
68 if [ ! -d "$MAIL_CORPUS" ] ; then
\r
69 @@ -72,11 +73,11 @@ add_email_corpus ()
\r
70 sed s,^,notmuch-email-corpus/, < \
\r
71 ${TEST_DIRECTORY}/corpus/manifest/MANIFEST.${corpus_size} >> $file_list
\r
73 - echo "notmuch-email-corpus/mail" >> $file_list
\r
74 + extract_dirs=("${extract_dirs[@]}" notmuch-email-corpus/mail)
\r
78 - if [[ -s $file_list ]]; then
\r
79 + if [[ -s $file_list || -n "${extract_dirs[*]}" ]]; then
\r
81 printf "Unpacking corpus\n"
\r
82 tar --checkpoint=.5000 --extract --strip-components=1 \
\r
83 @@ -84,7 +85,7 @@ add_email_corpus ()
\r
84 --use-compress-program ${XZ} \
\r
85 --file ../download/notmuch-email-corpus-${PERFTEST_VERSION}.tar.xz \
\r
86 --anchored --recursion \
\r
87 - --files-from $file_list
\r
88 + --files-from $file_list "${extract_dirs[@]}"
\r