debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 20:38:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

perf-test: use command line arguments for directories

Browse source 
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.
This commit is contained in:
David Bremner 2014-03-07 08:03:23 -04:00
parent 5348d1987c
commit 8fcc3260a9
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
performance-test/perf-test-lib.sh
View file

@ -63,8 +63,9 @@ add_email_corpus ()
fi fi
file_list=$(mktemp file_listXXXXXX) file_list=$(mktemp file_listXXXXXX)
declare -a extract_dirs
if [ ! -d "$TAG_CORPUS" ] ; then if [ ! -d "$TAG_CORPUS" ] ; then
echo "notmuch-email-corpus/tags" >> $file_list extract_dirs=("${extract_dirs[@]}" notmuch-email-corpus/tags)
fi fi
if [ ! -d "$MAIL_CORPUS" ] ; then if [ ! -d "$MAIL_CORPUS" ] ; then
@ -72,11 +73,11 @@ add_email_corpus ()
sed s,^,notmuch-email-corpus/, < \ sed s,^,notmuch-email-corpus/, < \
${TEST_DIRECTORY}/corpus/manifest/MANIFEST.${corpus_size} >> $file_list ${TEST_DIRECTORY}/corpus/manifest/MANIFEST.${corpus_size} >> $file_list
else else
echo "notmuch-email-corpus/mail" >> $file_list extract_dirs=("${extract_dirs[@]}" notmuch-email-corpus/mail)
fi fi
fi fi
if [[ -s $file_list ]]; then if [[ -s $file_list || -n "${extract_dirs[*]}" ]]; then
printf "Unpacking corpus\n" printf "Unpacking corpus\n"
tar --checkpoint=.5000 --extract --strip-components=1 \ tar --checkpoint=.5000 --extract --strip-components=1 \
@ -84,7 +85,7 @@ add_email_corpus ()
--use-compress-program ${XZ} \ --use-compress-program ${XZ} \
--file ../download/notmuch-email-corpus-${PERFTEST_VERSION}.tar.xz \ --file ../download/notmuch-email-corpus-${PERFTEST_VERSION}.tar.xz \
--anchored --recursion \ --anchored --recursion \
--files-from $file_list --files-from $file_list "${extract_dirs[@]}"
printf "\n" printf "\n"