Description: skip locale-dependent tests if no suitable locale present Author: Alexander Zangerl --- 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.