X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/4078e8a24878c584541a6caa8554c751121ab2b4..b4f2851d:/test/common.sh.in?ds=inline diff --git a/test/common.sh.in b/test/common.sh.in index fa8a0379..13db440a 100644 --- a/test/common.sh.in +++ b/test/common.sh.in @@ -13,14 +13,21 @@ test -z "$auxexecdir" && auxexecdir="@libdir@" test -z "$bindir" && bindir="@bindir@" test -z "$mandir" && mandir="@mandir@" test -z "$sysconfdir" && sysconfdir="@sysconfdir@" -test -z "$pagerpath" && pagerpath="@pagerpath@" -export MH_TEST_DIR auxexecdir bindir mandir sysconfdir pagerpath +test -z "$supported_locks" && supported_locks="@supported_locks@" +test -z "$MULTIBYTE_ENABLED" && MULTIBYTE_ENABLED="@MULTIBYTE_ENABLED@" +test -z "$ICONV_ENABLED" && ICONV_ENABLED="@ICONV_ENABLED@" +export MH_TEST_DIR auxexecdir bindir mandir sysconfdir +export MULTIBYTE_ENABLED ICONV_ENABLED -test -z "$MH_INST_DIR" && MH_INST_DIR=${MH_TEST_DIR}/inst +test -z "$MH_INST_DIR" && MH_INST_DIR="${MH_TEST_DIR}/inst" export MH_INST_DIR -unset MHBUILD MHCONTEXT MHMTSUSERCONF MHN MHSHOW MHSTORE MHTMPDIR -unset MHLDEBUG MHPDEBUG MHWDEBUG +unset MHBUILD MHCONTEXT MHMTSUSERCONF MHN MHSHOW MHSTORE +unset MHLDEBUG MHPDEBUG MHWDEBUG MM_CHARSET PAGER + +#### Use a test dir for tmp files when MHTMPDIR applies. +MHTMPDIR=$MH_TEST_DIR/Mail +export MHTMPDIR output_md5() { @@ -28,7 +35,7 @@ output_md5() #### the same line, the caller needs to add it. This avoids #### differences due to a leading '*' binary file indicator, for #### text files, on some platforms (Cygwin). - @MD5SUM@ $* | @MD5FMT@ | cut -d ' ' -f 1 + @MD5SUM@ $* | @MD5FMT@ | awk '{print $1}' } #### Use built-in $((...)) in test suite if shell supports it. @@ -52,20 +59,19 @@ test_skip () # portable implementation of 'which' utility findprog() { - FOUND= PROG="$1" - IFS_SAVE="$IFS" + #### Don't need to save current IFS because this function is run in + #### a subshell. IFS=: for D in $PATH; do if [ -z "$D" ]; then D=. fi - if [ -f "$D/$PROG" ] && [ -x "$D/$PROG" ]; then + if [ -f "$D/$PROG" -a -x "$D/$PROG" ]; then printf '%s\n' "$D/$PROG" break fi done - IFS="$IFS_SAVE" } require_prog () @@ -76,41 +82,129 @@ require_prog () } # Some stuff for doing silly progress indicators -progress_update () -{ - THIS="$1" - FIRST="$2" - LAST="$3" - arith_eval $LAST - $FIRST; RANGE=$arith_val - arith_eval $THIS - $FIRST; PROG=$arith_val - # this automatically rounds to nearest integer - arith_eval 100 \* $PROG / $RANGE; PERC=$arith_val - # note \r so next update will overwrite - printf "%3d%%\r" $PERC +if [ -t 1 ] ; then + progress_update () + { + THIS="$1" + FIRST="$2" + LAST="$3" + arith_eval $LAST - $FIRST; RANGE=$arith_val + arith_eval $THIS - $FIRST; PROG=$arith_val + # this automatically rounds to nearest integer + arith_eval 100 \* $PROG / $RANGE; PERC=$arith_val + # note \r so next update will overwrite + printf '%3d%%\r' $PERC + } + + progress_done () + { + printf '100%%\n' + } +else + # don't emit anything if stdout is not connected to a tty. + progress_update () + { + : + } + progress_done () + { + : + } +fi + +check_for_hard_links () { + set +e + + printf '' > "${MH_TEST_DIR}/$$-1" + if link "${MH_TEST_DIR}/$$-1" "${MH_TEST_DIR}/$$-2" 2>/dev/null; then + hard_links_supported=1 + else + hard_links_supported=0 + fi + rm -f "${MH_TEST_DIR}/$$-1" "${MH_TEST_DIR}/$$-2" + + set -e } -progress_done () -{ - printf "100%%\n" +#### Filter that squeezes blank lines, partially emulating GNU cat -s, +#### but sufficient for our purpose. +#### From http://www-rohan.sdsu.edu/doc/sed.html, compiled by Eric Pement. +squeeze_lines() { + sed '/^$/N;/\n$/D' +} + +#### Filter that converts non-breakable space U+00A0 to an ASCII space. +prepare_space() { + sed 's/'"`printf '\\302\\240'`"'/ /g' } #### check() requires two arguments, each the name of a file to be #### diff'ed. -#### If the same, the second file is removed. And the first file is -#### removed unless the optional third argument has a value of -#### 'keep first'. +#### If the contents are same, the second file is removed. And the +#### first file is removed unless there's an optional argument with +#### a value of 'keep first'. #### If different, global variable "failed" is incremented. +#### If there's an optional 'ignore space' argument, spacing differences +#### will not be considered signficant, emulating GNU diff -w. It +#### is assumed that the first file has already been run through +#### prepare_space. check() { - #### POSIX diff should support -c. - if diff -c "$1" "$2"; then - test $# -lt 3 -o "$3" != 'keep first' && rm -f "$1" - rm -f "$2" + first=$1; shift + second=$1; shift + keepfirst= + ignorespace= + while [ $# -gt 0 ]; do + case $1 in + 'keep first') keepfirst=1 ;; + 'ignore space') ignorespace=1 ;; + *) echo "$0: invalid check() argument \"$1\" in test suite" >&2 ;; + esac + shift + done + + success= + if [ "$ignorespace" ]; then + #### POSIX diff should support -b. + prepare_space <"$second" | diff -b "$first" - >/dev/null && success=1 else - echo "$0: test failed, outputs are in $1 and $2." - failed=`expr ${failed:-0} + 1` + cmp -s "$first" "$second" && success=1 fi + + if [ "$success" ]; then + [ "$keepfirst" ] || rm -f "$first" + rm -f "$second" + else + echo + #### POSIX diff should support -c. + diff -c "$first" "$second" || true + echo + echo "$0: test failed, outputs are in $first and $second." + failed=`expr ${failed:-0} + 1` + #### Set return status of the function. + [ $failed -eq 0 ] + fi +} + + +#### Shortcut to enable use of valgrind: set NMH_VALGRIND environment +#### variable (to anything) so run_* will use valgrind. +if [ "${NMH_VALGRIND}" -a -z "${NMH_TEST_PREFIX}" ]; then + #### Need absolute path to valgrind.supp in case the test does a cd. + NMH_TEST_PREFIX="valgrind --quiet --error-exitcode=1 \ + --suppressions=`cd ${srcdir} && pwd`/test/valgrind.supp" +fi + +#### Run test under another program by setting NMH_TEST_PREFIX +#### environment variable to, e.g., 'valgrind --quiet'. +run_prog() { + case $1 in + #### Don't run valgrind on shell built-in. + eval\ *) "$@" ;; + *) ${NMH_TEST_PREFIX} "$@" ;; + esac } + #### run_test() requires two arguments, the first is a program and #### arguments, the second is its expected one-line output string. #### If the actual output does not match that string: @@ -118,7 +212,11 @@ check() { #### if there is an optional third argument, it is used in the error message. run_test() { set +e - actual_output=`$1 2>&1` + case $1 in + #### Don't run valgrind on shell built-in. + eval\ *) actual_output=`$1 2>&1` ;; + *) actual_output=`${NMH_TEST_PREFIX} $1 2>&1` ;; + esac set -e if test x"$actual_output" != x"$2"; then echo "$0: ${3:-\"$1\"} expected:" 1>&2 @@ -131,41 +229,61 @@ run_test() { setup_test () { - MH=${MH_TEST_DIR}/Mail/.mh_profile - MHMTSCONF=${MH_INST_DIR}${sysconfdir}/mts.conf - PATH=${MH_INST_DIR}${bindir}:${PATH} - MH_LIB_DIR=${MH_INST_DIR}${auxexecdir} - export MH MHMTSCONF MH_LIB_DIR PATH + MH="${MH_TEST_DIR}/Mail/.mh_profile" + MHMTSCONF="${MH_INST_DIR}${sysconfdir}/mts.conf" + MH_LIB_DIR="${MH_INST_DIR}${auxexecdir}" + export MH MHMTSCONF MH_LIB_DIR # # Only install once # - if [ -d ${MH_INST_DIR}${bindir} ]; then + if [ -d "${MH_INST_DIR}${bindir}" ]; then : else - (cd ${MH_OBJ_DIR} && make DESTDIR=${MH_INST_DIR} SETGID_MAIL= install) || + (cd "${MH_OBJ_DIR}" && + make DESTDIR="${MH_INST_DIR}" SETGID_MAIL= install) || exit 1 + + #### Don't test with sendmail because it would really send the + #### mail. If configured to use sendmail, change to smtp instead + #### so that we use fakesmtp. + #### And set up the maildrop in the test directory so tests don't + #### use the user's real maildrop. + #### test-slocal needs to look at the original mts.conf, so save it. + mv -f "${MHMTSCONF}" "${MHMTSCONF}.old" + sed -e 's/mts: *.*/mts: smtp/' \ + -e "s%mmdfldir: *.*%mmdfldir: ${MH_TEST_DIR}/Mail%" \ + -e 's%mmdflfil: *.*%mmdflfil: maildrop%' \ + "${MHMTSCONF}.old" >"${MHMTSCONF}" fi + #### On Solaris, must set PATH after the install! + PATH="${MH_INST_DIR}${bindir}:${PATH}" + export PATH + # clean old test data - trap "rm -rf $MH_TEST_DIR/Mail" 0 + trap "rm -rf '$MH_TEST_DIR/Mail'" 0 # setup test data - mkdir $MH_TEST_DIR/Mail || exit 1 - cat > $MH < "$MH" < /dev/null @@ -176,6 +294,7 @@ EOF From: Test$i To: Some User Date: Fri, 29 Sep 2006 00:00:00 +Message-Id: $i@test.nmh Subject: Testing message $i This is message number $i