X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=performance-test%2Fperf-test-lib.sh;h=53ef96dae8b28d1afd3a609000719d01695b1daa;hb=74a883562b3e4593c75fa7625ff5cabab46a6466;hp=80ec1eb063cdbadfcea116e691ce6d96435d8cdb;hpb=7beeb8c88a014ecbc53d8241f10683b3c4c16228;p=notmuch diff --git a/performance-test/perf-test-lib.sh b/performance-test/perf-test-lib.sh index 80ec1eb0..53ef96da 100644 --- a/performance-test/perf-test-lib.sh +++ b/performance-test/perf-test-lib.sh @@ -1,5 +1,30 @@ . ./version.sh +corpus_size=large + +while test "$#" -ne 0 +do + case "$1" in + -d|--debug) + debug=t; + shift + ;; + -s|--small) + corpus_size=small; + shift + ;; + -m|--medium) + corpus_size=medium; + shift + ;; + -l|--large) + corpus_size=large; + shift + ;; + *) + echo "error: unknown performance test option '$1'" >&2; exit 1 ;; + esac +done . ../test/test-lib-common.sh set -e @@ -14,44 +39,63 @@ add_email_corpus () { rm -rf ${MAIL_DIR} - case "$1" in - --small) - arg="mail/enron/bailey-s" + case "$corpus_size" in + small) + mail_subdir="mail/enron/bailey-s" + check_for="${TEST_DIRECTORY}/corpus/$mail_subdir" ;; - --medium) - arg="mail/notmuch-archive" + medium) + mail_subdir="mail/notmuch-archive" + check_for="${TEST_DIRECTORY}/corpus/$mail_subdir" ;; *) - arg=mail + mail_subdir=mail + check_for="${TEST_DIRECTORY}/corpus/$mail_subdir/enron/wolfe-j" esac - if command -v pixz > /dev/null; then - XZ=pixz - else - XZ=xz + MAIL_CORPUS="${TEST_DIRECTORY}/corpus/$mail_subdir" + args=() + if [ ! -d "$check_for" ] ; then + args+=("notmuch-email-corpus/$mail_subdir") fi - printf "Unpacking corpus\n" - tar --checkpoint=.5000 --extract --strip-components=1 \ - --directory ${TMP_DIRECTORY} \ - --use-compress-program ${XZ} \ - --file ../download/notmuch-email-corpus-${PERFTEST_VERSION}.tar.xz \ - notmuch-email-corpus/"$arg" + if [[ ${#args[@]} > 0 ]]; then + if command -v pixz > /dev/null; then + XZ=pixz + else + XZ=xz + fi + + printf "Unpacking corpus\n" + mkdir -p "${TEST_DIRECTORY}/corpus" + + tar --checkpoint=.5000 --extract --strip-components=1 \ + --directory ${TEST_DIRECTORY}/corpus \ + --use-compress-program ${XZ} \ + --file ../download/notmuch-email-corpus-${PERFTEST_VERSION}.tar.xz \ + "${args[@]}" - printf "\n" + printf "\n" + + fi + + cp -lr $MAIL_CORPUS $MAIL_DIR } + print_header () { - printf "[v%4s] Wall(s)\tUsr(s)\tSys(s)\tRes(K)\tIn\tOut\n" \ - ${PERFTEST_VERSION} + printf "[v%4s %6s] Wall(s)\tUsr(s)\tSys(s)\tRes(K)\tIn/Out(512B)\n" \ + ${PERFTEST_VERSION} ${corpus_size} } time_run () { - printf "%-22s" "$1" + printf " %-22s" "$1" if test "$verbose" != "t"; then exec 4>test.output 3>&4; fi - if ! eval >&3 "/usr/bin/time -f '%e\t%U\t%S\t%M\t%I\t%O' $2" ; then + if ! eval >&3 "/usr/bin/time -f '%e\t%U\t%S\t%M\t%I/%O' $2" ; then test_failure=$(($test_failure + 1)) + return 1 fi + return 0 } time_done () { @@ -65,3 +109,6 @@ time_done () { cd -P "$test" || error "Cannot setup test environment" test_failure=0 + +echo +echo $(basename "$0"): "Testing ${test_description:-notmuch performance}"