From: David Bremner Date: Fri, 7 Mar 2014 12:03:23 +0000 (+2000) Subject: [PATCH] perf-test: use command line arguments for directories X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=275f70d900efdb14c2c3ad3472160e924a0a634c;p=notmuch-archives.git [PATCH] perf-test: use command line arguments for directories --- diff --git a/6c/69e0c950cf9ff4223052c472cc4d8acf300427 b/6c/69e0c950cf9ff4223052c472cc4d8acf300427 new file mode 100644 index 000000000..9d2735499 --- /dev/null +++ b/6c/69e0c950cf9ff4223052c472cc4d8acf300427 @@ -0,0 +1,94 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 1B10B431FAF + for ; Fri, 7 Mar 2014 04:05:49 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id nQL6S8QAfR4w for ; + Fri, 7 Mar 2014 04:05:43 -0800 (PST) +Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155]) + (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id A3ACD431FAE + for ; Fri, 7 Mar 2014 04:05:43 -0800 (PST) +Received: from remotemail by yantan.tethera.net with local (Exim 4.80) + (envelope-from ) + id 1WLtX3-0006Ey-9w; Fri, 07 Mar 2014 08:05:41 -0400 +Received: (nullmailer pid 20366 invoked by uid 1000); Fri, 07 Mar 2014 + 12:05:37 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [PATCH] perf-test: use command line arguments for directories +Date: Fri, 7 Mar 2014 08:03:23 -0400 +Message-Id: <1394193803-20304-1-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.8.5.3 +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Fri, 07 Mar 2014 12:05:49 -0000 + +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. +--- + performance-test/perf-test-lib.sh | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/performance-test/perf-test-lib.sh b/performance-test/perf-test-lib.sh +index 44708cf..75e3d87 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" + +-- +1.8.5.3 +