X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/bdb55520b3ca4ca887497822aee7d399337228aa..4857e59b250f28a2d020bccac8bbcb489b48e328:/test/common.sh.in diff --git a/test/common.sh.in b/test/common.sh.in index 4c804155..aa1e8455 100644 --- a/test/common.sh.in +++ b/test/common.sh.in @@ -1,27 +1,36 @@ -# Common helper routines for test shell scripts -- intended to be sourced by them +# Common helper routines for test shell scripts -- to be sourced by them # @configure_input@ -#### The following exported variables are set by "make check". Ensure +#### The following variables are set by "make check". Ensure #### that they are set here so that individual tests can be run #### outside of make. Requires that MH_OBJ_DIR be set on entry. test -z "$MH_TEST_DIR" && MH_TEST_DIR="$MH_OBJ_DIR/test/testdir" +test -z "$MH_INST_DIR" && MH_INST_DIR="${MH_TEST_DIR}/inst" test -z "$prefix" && prefix=@prefix@ test -z "$datarootdir" && datarootdir=@datarootdir@ test -z "$exec_prefix" && exec_prefix=@exec_prefix@ -test -z "$auxexecdir" && auxexecdir="@libdir@" test -z "$bindir" && bindir="@bindir@" test -z "$mandir" && mandir="@mandir@" -test -z "$sysconfdir" && sysconfdir="@sysconfdir@" +test -z "$nmhetcdir" && nmhetcdir="@sysconfdir@/nmh" +#### The following doesn't support running the distcheck version of +#### test-mhparam standalone, but only via make distcheck. +test -z "$nmhetcdirinst" && nmhetcdirinst="@nmhetcdirinst@$nmhetcdir" +test -z "$nmhlibexecdir" && nmhlibexecdir="@libexecdir@/nmh" +test -z "$supported_locks" && supported_locks="@supported_locks@" +test -z "$default_locking" && default_locking="@default_locking@" test -z "$MULTIBYTE_ENABLED" && MULTIBYTE_ENABLED="@MULTIBYTE_ENABLED@" -export MH_TEST_DIR auxexecdir bindir mandir sysconfdir -export MULTIBYTE_ENABLED +test -z "$ICONV_ENABLED" && ICONV_ENABLED="@ICONV_ENABLED@" -test -z "$MH_INST_DIR" && MH_INST_DIR="${MH_TEST_DIR}/inst" -export MH_INST_DIR +unset MAILDROP MHBUILD MHCONTEXT MHMTSUSERCONF MHN MHSHOW MHSTORE +unset MHLDEBUG MHPDEBUG MHWDEBUG PAGER +#### Set LC_ALL in individual tests as needed. Unset these so +#### that we don't depend on user's settings in other tests. +unset LANG LC_ALL LC_CTYPE -unset MHBUILD MHCONTEXT MHMTSUSERCONF MHN MHSHOW MHSTORE MHTMPDIR -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() { @@ -29,7 +38,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. @@ -75,6 +84,18 @@ require_prog () fi } +# Skip test if none of the offered locales are supported. +require_locale () +{ + for locale in "$@"; do + if locale -a | grep -i "$locale" >/dev/null; then + return + fi + done + + test_skip "no suitable locale available" +} + # Some stuff for doing silly progress indicators if [ -t 1 ] ; then progress_update () @@ -89,7 +110,7 @@ if [ -t 1 ] ; then # note \r so next update will overwrite printf '%3d%%\r' $PERC } - + progress_done () { printf '100%%\n' @@ -120,26 +141,88 @@ check_for_hard_links () { set -e } +#### 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 different, global variable "failed" is incremented. +#### If the contents are same, the second file is removed. If different, +#### global variable "failed" is incremented. +#### Optional arguments: +#### 'keep first' -- first file is removed unless this is present. +#### 'ignore space' -- 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. +#### ':' -- will print '' in the failure message, +#### to make it easier to tell which of multiple tests has failed. check() { - #### POSIX diff should support -c. - if cmp -s "$1" "$2"; then - test $# -lt 3 -o "$3" != 'keep first' && rm -f "$1" - rm -f "$2" + first=$1; shift + second=$1; shift + keepfirst= + ignorespace= + label=test + while [ $# -gt 0 ]; do + case $1 in + 'keep first') keepfirst=1 ;; + 'ignore space') ignorespace=1 ;; + ':') shift; label=\'"$*"\'; break ;; + *) 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 - diff -c "$1" "$2" - echo - 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: $label 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: @@ -147,7 +230,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 @@ -161,10 +248,9 @@ 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 + MHMTSCONF="${MH_INST_DIR}${nmhetcdir}/mts.conf" + MH_LIBEXEC_DIR="${MH_INST_DIR}${nmhlibexecdir}" + export MH MHMTSCONF MH_LIBEXEC_DIR # # Only install once @@ -189,30 +275,43 @@ setup_test () "${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 "cd $MH_TEST_DIR; rm -rf '$MH_TEST_DIR/Mail'" 0 # setup test data - mkdir "$MH_TEST_DIR/Mail" || exit 1 + mkdir -p "$MH_TEST_DIR/Mail" || exit 1 cat > "$MH" < /dev/null # create 10 basic messages