On Sun, 08 Jun 2014 10:08:12 -0400, Ken Hornstein writes: >I am hoping that this release will be good enough to be the basis of >the 1.6 final release, so I would encourage everyone to download it >and try it out.
i've just packaged and uploaded the debian build of this version, and things look pretty good. as expected there are a few small debian differences (e.g. all manpages to go in as whatever.1mh instead of whatever.1); besides that there are two patches that i think might be interesting for upstream: 1. the automatic debian build daemons and build environments are very stripped down, without guarantees wrt. particular locales being configured. it makes no sense to attempt the tests that only work if en_US.UTF-8 is available, so i've made the affected tests check that and skip if necessary. 2. in my experience the fake smtpd doesn't always start up fast enough for the subsequent send invocation, so i've adjusted that test to wait and retry a few times if required. regards az
Author: Alexander Zangerl <[email protected]> Subject: fakesmtp test tool doesn't always start fast enough --- a/test/post/test-post-common.sh +++ b/test/post/test-post-common.sh @@ -29,7 +29,17 @@ echo "clientname: nosuchhost.example.com test_post () { pid=`"${MH_OBJ_DIR}/test/fakesmtp" "$1" $localport` - run_prog send -draft -server 127.0.0.1 -port $localport $3 || exit 1 + # The server doesn't always come up fast enough, so sleep and + # retry a few times if it fails... + status=1 + for i in 0 1 2 3 4 5 6 7 8 9; do + if run_prog send -draft -server 127.0.0.1 -port $localport $3 ; then + status=0 + break + fi + sleep 1 + done + [ $status -eq 0 ] || exit 1 # # It's hard to calculate the exact Date: header post is going to
Description: skip locale-dependent tests if no suitable locale present Author: Alexander Zangerl <[email protected]> --- a/test/dist/test-dist +++ b/test/dist/test-dist @@ -16,6 +16,10 @@ fi setup_test +if ! locale -a | grep -iq en_us.utf; then + test_skip "no suitable locale available" +fi + expected=$MH_TEST_DIR/$$.expected expected_err=$MH_TEST_DIR/$$.expected_err actual=$MH_TEST_DIR/$$.actual --- a/test/mhbuild/test-attach +++ b/test/mhbuild/test-attach @@ -14,6 +14,9 @@ fi setup_test +if ! locale -a | grep -iq en_us.utf; then + test_skip "no suitable locale available" +fi LC_ALL=en_US.UTF-8; export LC_ALL draft="$MH_TEST_DIR/$$.draft" --- a/test/mhbuild/test-cte +++ b/test/mhbuild/test-cte @@ -16,6 +16,9 @@ setup_test set -e +if ! locale -a | grep -iq en_us.utf; then + test_skip "no suitable locale available" +fi LC_ALL=en_US.UTF-8; export LC_ALL draft="$MH_TEST_DIR/$$.draft" --- a/test/mhbuild/test-ext-params +++ b/test/mhbuild/test-ext-params @@ -14,6 +14,9 @@ fi setup_test +if ! locale -a | grep -iq en_us.utf; then + test_skip "no suitable locale available" +fi LC_ALL=en_US.UTF-8; export LC_ALL draft="$MH_TEST_DIR/$$.draft" --- a/test/mhbuild/test-header-encode +++ b/test/mhbuild/test-header-encode @@ -22,6 +22,9 @@ backupname="${MH_TEST_DIR}/`mhparam sbac # We're going to hardcode UTF-8 for this test. # +if ! locale -a | grep -iq en_us.utf; then + test_skip "no suitable locale available" +fi LC_ALL=en_US.UTF-8; export LC_ALL # --- a/test/mhfixmsg/test-mhfixmsg +++ b/test/mhfixmsg/test-mhfixmsg @@ -20,6 +20,9 @@ actual="$MH_TEST_DIR/test-mhfixmsg$$.act actual_err="$MH_TEST_DIR/test-mhfixmsg$$.actual_err" #### Make sure that html-to-text conversion is what we expect. +if ! locale -a | grep -iq en_us.utf; then + test_skip "no suitable locale available" +fi LC_ALL=en_US.UTF-8; export LC_ALL if grep mhfixmsg-format-text/html "${MH_TEST_DIR}/Mail/mhn.defaults" \ --- a/test/mhlist/test-ext-params +++ b/test/mhlist/test-ext-params @@ -18,6 +18,10 @@ setup_test expected=$MH_TEST_DIR/$$.expected actual=$MH_TEST_DIR/$$.actual + +if ! locale -a | grep -iq en_us.utf; then + test_skip "no suitable locale available" +fi LC_ALL=en_US.UTF-8; export LC_ALL # --- a/test/mhshow/test-textcharset +++ b/test/mhshow/test-textcharset @@ -20,6 +20,9 @@ if test "$ICONV_ENABLED" -eq 0; then test_skip 'test-textcharset requires that nmh have been built with iconv' fi +if ! locale -a | grep -iq en_us.utf; then + test_skip "no suitable locale available" +fi LC_ALL=en_US.UTF-8; export LC_ALL expected="$MH_TEST_DIR"/$$.expected --- a/test/pick/test-pick +++ b/test/pick/test-pick @@ -16,6 +16,10 @@ fi setup_test +if ! locale -a | grep -iq en_us.utf; then + test_skip "no suitable locale available" +fi + expected=$MH_TEST_DIR/$$.expected actual=$MH_TEST_DIR/$$.actual --- a/test/scan/test-scan-multibyte +++ b/test/scan/test-scan-multibyte @@ -26,6 +26,9 @@ if test "${MULTIBYTE_ENABLED}" -ne 1; th test_skip "configure did not detect multibyte support" fi +if ! locale -a | grep -iq en_us.utf; then + test_skip "no suitable locale available" +fi LC_ALL=en_US.UTF-8; export LC_ALL # --- a/test/mhshow/test-charset +++ b/test/mhshow/test-charset @@ -16,6 +16,9 @@ fi setup_test +if ! locale -a | grep -iq en_us.utf; then + test_skip "no suitable locale available" +fi LC_ALL=en_US.UTF-8; export LC_ALL test "$ICONV_ENABLED" -eq 0 && text_size=10 || text_size=11 --- a/test/mhbuild/test-utf8-body +++ b/test/mhbuild/test-utf8-body @@ -19,6 +19,10 @@ testname="${MH_TEST_DIR}/$$" expected="$MH_TEST_DIR/$$.expected" actual="$MH_TEST_DIR/$$.actual" +if ! locale -a | grep -iq en_us.utf; then + test_skip "no suitable locale available" +fi + LC_ALL=en_US.UTF-8; export LC_ALL #### Rely on sendmail/pipe below to override default mts.
-- Alexander Zangerl + GPG Key 0xB963BD5F (or 0x42BD645D) + http://snafu.priv.at/ "[Perl] isn't a programming language, it's a thousand special case rules flying in close formation." -- Peter da Silva
signature.asc
Description: Digital Signature
_______________________________________________ Nmh-workers mailing list [email protected] https://lists.nongnu.org/mailman/listinfo/nmh-workers
