14/cd63184e648c67829b16643c5d608ce0e92db4

   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 ABCA3431FD0\r
   6         for <notmuch@notmuchmail.org>; Sat, 30 Nov 2013 19:00:34 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: 0\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
  12         autolearn=disabled\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 7TmkQaiYQig9 for <notmuch@notmuchmail.org>;\r
  16         Sat, 30 Nov 2013 19:00:26 -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 BE97A431FAF\r
  21         for <notmuch@notmuchmail.org>; Sat, 30 Nov 2013 19:00:26 -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 1VmxGi-0006P1-8g; Sat, 30 Nov 2013 23:00:24 -0400\r
  25 Received: (nullmailer pid 18172 invoked by uid 1000); Sun, 01 Dec 2013\r
  26         03:00:20 -0000\r
  27 From: David Bremner <david@tethera.net>\r
  28 To: notmuch@notmuchmail.org\r
  29 Subject: [PATCH] perf-test: bump version to 0.4, use manifest files\r
  30 Date: Sat, 30 Nov 2013 23:00:03 -0400\r
  31 Message-Id: <1385866803-17847-1-git-send-email-david@tethera.net>\r
  32 X-Mailer: git-send-email 1.8.4.2\r
  33 X-BeenThere: notmuch@notmuchmail.org\r
  34 X-Mailman-Version: 2.1.13\r
  35 Precedence: list\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: Sun, 01 Dec 2013 03:00:34 -0000\r
  46 \r
  47 The new revision of the performance test includes manifests for each corpus,\r
  48 so update the support library to use these manifests at the same time.\r
  49 ---\r
  50 \r
  51 Jani's message\r
  52        \r
  53        id:d74499f1e462755676edf9aa6ab689ba47fa2471.1385825425.git.jani@nikula.org\r
  54 \r
  55 reminded me I had an update of the performance test suite in the\r
  56 works.  The new suite is available from\r
  57 \r
  58     http://tesseract.cs.unb.ca/notmuch/notmuch-email-corpus-0.4.tar.xz\r
  59     http://tesseract.cs.unb.ca/notmuch/notmuch-email-corpus-0.4.tar.xz.asc\r
  60 \r
  61 I haven't yet uploaded it to notmuchmail.org because of disk space concerns.\r
  62 \r
  63  .../download/notmuch-email-corpus-0.4.tar.xz.asc   | 14 +++++\r
  64  performance-test/perf-test-lib.sh                  | 72 ++++++++++++++--------\r
  65  performance-test/version.sh                        |  2 +-\r
  66  3 files changed, 60 insertions(+), 28 deletions(-)\r
  67  create mode 100644 performance-test/download/notmuch-email-corpus-0.4.tar.xz.asc\r
  68 \r
  69 diff --git a/performance-test/download/notmuch-email-corpus-0.4.tar.xz.asc b/performance-test/download/notmuch-email-corpus-0.4.tar.xz.asc\r
  70 new file mode 100644\r
  71 index 0000000..72dedd8\r
  72 --- /dev/null\r
  73 +++ b/performance-test/download/notmuch-email-corpus-0.4.tar.xz.asc\r
  74 @@ -0,0 +1,14 @@\r
  75 +-----BEGIN PGP SIGNATURE-----\r
  76 +Version: GnuPG v1.4.15 (GNU/Linux)\r
  77 +\r
  78 +iQGcBAABCAAGBQJSdaDkAAoJEPIClx2kp54sQ54L/ikkvF1fy88hjLitN59v6g2J\r
  79 +vw85YNRifNHyp/UXI6nt2eXFzyWJiRHuvHFoBgmEsJVxauOKw61Gs2zd53x9Ear4\r
  80 +MGcQWyiM1cnwX/nD7GvxRQNh33f+FEamTjg+QhG47K0A2YdLWcDC7r9GMatGT11x\r
  81 +5KE24WQGOqtgQn/9qNtJvkiKIehpRiDTaW/QJ7mTCYeJFjIHJUY8dxyfiTtkJ0z7\r
  82 +cJ6omehvWSw4STbEg65XJgqykxMdltNEavfvSbAT73FgmkkyXxul0s5hDZ/esd0n\r
  83 +re3dyDxGt085POiAgPti05a4tJI5EQC2wLBUFri0s2JdMtazcD6yVuHNbVzZ4Do3\r
  84 +nL/sgwKGUq5wRrPqPWp6HXtZ9zG+/V7hFNrr/l42qGrLqsSh0bqvEnUiwczZLBGy\r
  85 +NEs4G8VjmfS2cMKePsWaekBAvFUtb47PSB6JIPwpCNvKXDrcCb28eOQVB2atgj1h\r
  86 +9SktOtWYJhWIQp2YW9iae30Z6lhCcdPRRHTFMQq2nQ==\r
  87 +=eSMY\r
  88 +-----END PGP SIGNATURE-----\r
  89 diff --git a/performance-test/perf-test-lib.sh b/performance-test/perf-test-lib.sh\r
  90 index 9ee7661..44708cf 100644\r
  91 --- a/performance-test/perf-test-lib.sh\r
  92 +++ b/performance-test/perf-test-lib.sh\r
  93 @@ -41,52 +41,70 @@ add_email_corpus ()\r
  94  {\r
  95      rm -rf ${MAIL_DIR}\r
  96  \r
  97 -    case "$corpus_size" in\r
  98 -       small)\r
  99 -           mail_subdir="mail/enron/bailey-s"\r
 100 -           check_for="${TEST_DIRECTORY}/corpus/$mail_subdir"\r
 101 -           ;;\r
 102 -       medium)\r
 103 -           mail_subdir="mail/notmuch-archive"\r
 104 -           check_for="${TEST_DIRECTORY}/corpus/$mail_subdir"\r
 105 -           ;;\r
 106 -       *)\r
 107 -           mail_subdir=mail\r
 108 -           check_for="${TEST_DIRECTORY}/corpus/$mail_subdir/enron/wolfe-j"\r
 109 -    esac\r
 110 +    CORPUS_DIR=${TEST_DIRECTORY}/corpus\r
 111 +    mkdir -p "${CORPUS_DIR}"\r
 112  \r
 113 -    MAIL_CORPUS="${TEST_DIRECTORY}/corpus/$mail_subdir"\r
 114 -    TAG_CORPUS="${TEST_DIRECTORY}/corpus/tags"\r
 115 +    MAIL_CORPUS="${CORPUS_DIR}/mail.${corpus_size}"\r
 116 +    TAG_CORPUS="${CORPUS_DIR}/tags"\r
 117  \r
 118 -    args=()\r
 119 -    if [ ! -d "$TAG_CORPUS" ] ; then\r
 120 -       args+=("notmuch-email-corpus/tags")\r
 121 +    if command -v pixz > /dev/null; then\r
 122 +       XZ=pixz\r
 123 +    else\r
 124 +       XZ=xz\r
 125      fi\r
 126  \r
 127 -    if [ ! -d "$check_for" ] ; then\r
 128 -       args+=("notmuch-email-corpus/$mail_subdir")\r
 129 +    if [ ! -d "${CORPUS_DIR}/manifest" ]; then\r
 130 +\r
 131 +       printf "Unpacking manifests\n"\r
 132 +       tar --extract --use-compress-program ${XZ} --strip-components=1 \\r
 133 +           --directory ${TEST_DIRECTORY}/corpus \\r
 134 +           --wildcards --file ../download/notmuch-email-corpus-${PERFTEST_VERSION}.tar.xz \\r
 135 +           'notmuch-email-corpus/manifest/*'\r
 136      fi\r
 137  \r
 138 -    if [[ ${#args[@]} > 0 ]]; then\r
 139 -       if command -v pixz > /dev/null; then\r
 140 -           XZ=pixz\r
 141 +    file_list=$(mktemp file_listXXXXXX)\r
 142 +    if [ ! -d "$TAG_CORPUS" ] ; then\r
 143 +       echo "notmuch-email-corpus/tags" >> $file_list\r
 144 +    fi\r
 145 +\r
 146 +    if [ ! -d "$MAIL_CORPUS" ] ; then\r
 147 +       if [[ "$corpus_size" != "large" ]]; then\r
 148 +           sed s,^,notmuch-email-corpus/, < \\r
 149 +               ${TEST_DIRECTORY}/corpus/manifest/MANIFEST.${corpus_size} >> $file_list\r
 150         else\r
 151 -           XZ=xz\r
 152 +           echo "notmuch-email-corpus/mail" >> $file_list\r
 153         fi\r
 154 +    fi\r
 155  \r
 156 -       printf "Unpacking corpus\n"\r
 157 -       mkdir -p "${TEST_DIRECTORY}/corpus"\r
 158 +    if [[ -s $file_list ]]; then\r
 159  \r
 160 +       printf "Unpacking corpus\n"\r
 161         tar --checkpoint=.5000 --extract --strip-components=1 \\r
 162             --directory ${TEST_DIRECTORY}/corpus \\r
 163             --use-compress-program ${XZ} \\r
 164             --file ../download/notmuch-email-corpus-${PERFTEST_VERSION}.tar.xz \\r
 165 -           "${args[@]}"\r
 166 +           --anchored --recursion \\r
 167 +           --files-from $file_list\r
 168  \r
 169         printf "\n"\r
 170  \r
 171 +       if [[ ! -d ${MAIL_CORPUS} ]]; then\r
 172 +           printf "creating link farm\n"\r
 173 +\r
 174 +           if [[ "$corpus_size" = large ]]; then\r
 175 +               cp -rl ${TEST_DIRECTORY}/corpus/mail ${MAIL_CORPUS}\r
 176 +           else\r
 177 +               while read -r file; do\r
 178 +                   tdir=${MAIL_CORPUS}/$(dirname $file)\r
 179 +                   mkdir -p $tdir\r
 180 +                   ln ${TEST_DIRECTORY}/corpus/$file $tdir\r
 181 +               done <${TEST_DIRECTORY}/corpus/manifest/MANIFEST.${corpus_size}\r
 182 +           fi\r
 183 +       fi\r
 184 +\r
 185      fi\r
 186  \r
 187 +    rm $file_list\r
 188      cp -lr $TAG_CORPUS $TMP_DIRECTORY/corpus.tags\r
 189      cp -lr $MAIL_CORPUS $MAIL_DIR\r
 190  }\r
 191 diff --git a/performance-test/version.sh b/performance-test/version.sh\r
 192 index afafc73..f02527a 100644\r
 193 --- a/performance-test/version.sh\r
 194 +++ b/performance-test/version.sh\r
 195 @@ -1,3 +1,3 @@\r
 196  # this should be both a valid Makefile fragment and valid POSIX(ish) shell.\r
 197  \r
 198 -PERFTEST_VERSION=0.3\r
 199 +PERFTEST_VERSION=0.4\r
 200 -- \r
 201 1.8.4.2\r
 202 \r