Added ct_str_type() and ct_str_subtype() functions, to translate

[nmh] / test / common.sh.in

diff --git a/test/common.sh.in b/test/common.sh.in
index be8b25dfb046491df8362a454b68ed337954c4d3..004c8b1f447e4d4e33fe8edabafa207e40940ad4 100644 (file)
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -9,21 +9,25 @@ test -z "$MH_TEST_DIR"  &&  MH_TEST_DIR="$MH_OBJ_DIR/test/testdir"
 test -z "$prefix"  &&  prefix=@prefix@
 test -z "$datarootdir"  &&  datarootdir=@datarootdir@
 test -z "$exec_prefix"  &&  exec_prefix=@exec_prefix@
 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 "$nmhexecdir"  &&  nmhexecdir="@libexecdir@/nmh"

 test -z "$bindir"  &&  bindir="@bindir@"
 test -z "$mandir"  &&  mandir="@mandir@"
 test -z "$bindir"  &&  bindir="@bindir@"
 test -z "$mandir"  &&  mandir="@mandir@"

-test -z "$sysconfdir"  &&  sysconfdir="@sysconfdir@"
+test -z "$nmhetcdir"  &&  nmhetcdir="@sysconfdir@/nmh"

 test -z "$supported_locks"  &&  supported_locks="@supported_locks@"
 test -z "$supported_locks"  &&  supported_locks="@supported_locks@"

+test -z "$default_locking"  &&  default_locking="@default_locking@"

 test -z "$MULTIBYTE_ENABLED"  &&  MULTIBYTE_ENABLED="@MULTIBYTE_ENABLED@"
 test -z "$ICONV_ENABLED"  &&  ICONV_ENABLED="@ICONV_ENABLED@"
 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 MH_TEST_DIR nmhexecdir bindir mandir nmhetcdir

 export MULTIBYTE_ENABLED ICONV_ENABLED
 
 test -z "$MH_INST_DIR"  &&  MH_INST_DIR="${MH_TEST_DIR}/inst"
 export MH_INST_DIR
 
 export MULTIBYTE_ENABLED ICONV_ENABLED
 
 test -z "$MH_INST_DIR"  &&  MH_INST_DIR="${MH_TEST_DIR}/inst"
 export MH_INST_DIR
 

-unset MHBUILD MHCONTEXT MHMTSUSERCONF MHN MHSHOW MHSTORE
+unset MAILDROP MHBUILD MHCONTEXT MHMTSUSERCONF MHN MHSHOW MHSTORE

 unset MHLDEBUG MHPDEBUG MHWDEBUG PAGER
 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

 
 #### Use a test dir for tmp files when MHTMPDIR applies.
 MHTMPDIR=$MH_TEST_DIR/Mail
 
 #### Use a test dir for tmp files when MHTMPDIR applies.
 MHTMPDIR=$MH_TEST_DIR/Mail


@@ -81,6 +85,18 @@ require_prog ()
   fi
 }
 
   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 ()
 # Some stuff for doing silly progress indicators
 if [ -t 1 ] ; then
   progress_update ()


@@ -230,9 +246,9 @@ run_test() {
 setup_test ()
 {
   MH="${MH_TEST_DIR}/Mail/.mh_profile"
 setup_test ()
 {
   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
+  MHMTSCONF="${MH_INST_DIR}${nmhetcdir}/mts.conf"
+  MH_LIBEXEC_DIR="${MH_INST_DIR}${nmhexecdir}"
+  export MH MHMTSCONF MH_LIBEXEC_DIR

 
   #
   # Only install once
 
   #
   # Only install once


@@ -262,19 +278,19 @@ setup_test ()
   export PATH
 
   # clean old test data
   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 -p "$MH_TEST_DIR/Mail" || exit 1
   cat > "$MH" <<EOF || exit 1
 Path: ${MH_TEST_DIR}/Mail
 buildmimeproc: ${MH_INST_DIR}${bindir}/mhbuild
 fileproc: ${MH_INST_DIR}${bindir}/refile
   # setup test data
   mkdir -p "$MH_TEST_DIR/Mail" || exit 1
   cat > "$MH" <<EOF || exit 1
 Path: ${MH_TEST_DIR}/Mail
 buildmimeproc: ${MH_INST_DIR}${bindir}/mhbuild
 fileproc: ${MH_INST_DIR}${bindir}/refile

-libdir: ${MH_LIB_DIR}
+libexecdir: ${MH_LIBEXEC_DIR}

 mhbuild: -nocontentid
 mhbuild: -nocontentid

-mhlproc: ${MH_LIB_DIR}/mhl
+mhlproc: ${MH_LIBEXEC_DIR}/mhl

 moreproc: cat
 moreproc: cat

-postproc: ${MH_LIB_DIR}/post
-showproc: ${MH_LIB_DIR}/mhl
+postproc: ${MH_LIBEXEC_DIR}/post
+showproc: ${MH_LIBEXEC_DIR}/mhl

 EOF
 
   for f in MailAliases components digestcomps distcomps forwcomps mhl.body \
 EOF
 
   for f in MailAliases components digestcomps distcomps forwcomps mhl.body \


@@ -283,7 +299,7 @@ EOF
            scan.YYYYMMDD scan.curses scan.default scan.highlighted scan.mailx \
           scan.nomime scan.size scan.time scan.timely scan.unseen
   do
            scan.YYYYMMDD scan.curses scan.default scan.highlighted scan.mailx \
           scan.nomime scan.size scan.time scan.timely scan.unseen
   do

-    cp "${MH_INST_DIR}${sysconfdir}/${f}" "${MH_TEST_DIR}/Mail" || exit 1
+    cp "${MH_INST_DIR}${nmhetcdir}/${f}" "${MH_TEST_DIR}/Mail" || exit 1

   done
 
   folder -create +inbox > /dev/null
   done
 
   folder -create +inbox > /dev/null