X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Fcommon.sh.in;h=dd68f77455e49decaa7dc1d8e4db966dabc39e2b;hb=b15f35a73878825d1824a710982d6769ece9b6cb;hp=2308d7071544944ed79adb17669a3581facf42ae;hpb=18b138a1003cf07114c2a4d03e4372e4e7bdc5f4;p=mmh diff --git a/test/common.sh.in b/test/common.sh.in index 2308d70..dd68f77 100644 --- a/test/common.sh.in +++ b/test/common.sh.in @@ -13,17 +13,37 @@ test -z "$auxexecdir" && auxexecdir="@libdir@" test -z "$bindir" && bindir="@bindir@" test -z "$mandir" && mandir="@mandir@" test -z "$sysconfdir" && sysconfdir="@sysconfdir@" -export MH_TEST_DIR auxexecdir bindir mandir sysconfdir +test -z "$pagerpath" && pagerpath="@pagerpath@" +test -z "$MULTIBYTE_ENABLED" && MULTIBYTE_ENABLED="@MULTIBYTE_ENABLED@" +export MH_TEST_DIR auxexecdir bindir mandir sysconfdir pagerpath +export MULTIBYTE_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 MM_CHARSET PAGER output_md5() { - @MD5SUM@ $* | @MD5FMT@ + #### Output just the checksum. If the filename needs to appear on + #### 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 } +#### Use built-in $((...)) in test suite if shell supports it. +#### Borrowed from configure's as_fn_arith. The result is placed +#### in global arith_val. +#### Detected at run-time instead of by configure to allow testing +#### with different shells. +if (eval "test \$(( 1 + 1 )) = 2" 2>/dev/null); then + eval 'arith_eval () { arith_val=$(( $* )); }' +else + arith_eval () { arith_val=`expr "$@" || test $? -eq 1`; } +fi + test_skip () { WHY="$1" @@ -34,25 +54,24 @@ 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 () { - if [ -z "$(findprog $1)" ]; then + if [ -z "`findprog $1`" ]; then test_skip "missing $1" fi } @@ -63,17 +82,31 @@ progress_update () THIS="$1" FIRST="$2" LAST="$3" - RANGE="$(($LAST - $FIRST))" - PROG="$(($THIS - $FIRST))" + arith_eval $LAST - $FIRST; RANGE=$arith_val + arith_eval $THIS - $FIRST; PROG=$arith_val # this automatically rounds to nearest integer - PERC="$(((100 * $PROG) / $RANGE))" + arith_eval 100 \* $PROG / $RANGE; PERC=$arith_val # note \r so next update will overwrite - printf "%3d%%\r" $PERC + printf '%3d%%\r' $PERC } progress_done () { - printf "100%%\n" + printf '100%%\n' +} + +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 } #### check() requires two arguments, each the name of a file to be @@ -93,52 +126,77 @@ check() { fi } -#### check_string() 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, an error message is -#### printed and global variable "failed" is incremented. -check_string() { - #### Invert exit status to prevent triggering immediate exit due to set -e. - ! actual_output=`$1 2>&1` - if test "$actual_output" != "$2"; then - echo "$0: \"$1\" should have produced:" 1>&2 - echo " $2" 1>&2 - echo "but instead produced:" 1>&2 - echo " $actual_output" 1>&2 +#### 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: +#### an error message is printed and global variable "failed" is incremented; +#### if there is an optional third argument, it is used in the error message. +run_test() { + set +e + actual_output=`$1 2>&1` + set -e + if test x"$actual_output" != x"$2"; then + echo "$0: ${3:-\"$1\"} expected:" 1>&2 + echo " '$2'" 1>&2 + echo "but instead got:" 1>&2 + echo " '$actual_output'" 1>&2 failed=`expr ${failed:-0} + 1` fi } setup_test () { - export MH=${MH_TEST_DIR}/Mail/.mh_profile - export MHMTSCONF=${MH_INST_DIR}${sysconfdir}/mts.conf - export PATH=${MH_INST_DIR}${bindir}:${PATH} - export MH_LIB_DIR=${MH_INST_DIR}${auxexecdir} + 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 # # Only install once # - if [ ! -d ${MH_INST_DIR}${bindir} ]; then - (cd ${MH_OBJ_DIR} && make DESTDIR=${MH_INST_DIR} install) || exit 1 + if [ -d "${MH_INST_DIR}${bindir}" ]; then + : + else + (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. + sed -e 's/mts: *.*/mts: smtp/' \ + -e "s%mmdfldir: *.*%mmdfldir: ${MH_TEST_DIR}/Mail%" \ + -e 's%mmdflfil: *.*%mmdflfil: maildrop%' \ + "${MHMTSCONF}" >"${MHMTSCONF}.new" + mv -f "${MHMTSCONF}.new" "${MHMTSCONF}" fi # clean old test data - trap "rm -rf $MH_TEST_DIR/Mail; exit \$status" 0 + trap "rm -rf '$MH_TEST_DIR/Mail'" 0 # setup test data - mkdir $MH_TEST_DIR/Mail || exit 1 - cat > $MH < "$MH" < /dev/null @@ -149,6 +207,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