[Nmh-commits] [SCM] The nmh Mail Handling System branch, master, updated. 96314ed680840a57b0fef7b7d8a4c93925596e86

[Ken Hornstein]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The nmh Mail Handling System".

The branch, master has been updated
       via  96314ed680840a57b0fef7b7d8a4c93925596e86 (commit)
       via  3439af1e13339ebd1c189f8afaae93a6d9fd27a7 (commit)
      from  6106441685a38400d9aa94ccb7218218102f941c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=96314ed680840a57b0fef7b7d8a4c93925596e86


commit 96314ed680840a57b0fef7b7d8a4c93925596e86
Author: Ken Hornstein <address@hidden>
Date:   Fri Feb 10 23:27:36 2012 -0500

    Switch over to using the template files out of our inst directory.

diff --git a/test/common.sh.in b/test/common.sh.in
index adcb685..34767f4 100644
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -89,16 +89,11 @@ EOF
 
   for f in MailAliases components digestcomps distcomps forwcomps mhl.body \
           mhl.digest mhl.format mhl.forward mhl.headers mhl.reply \
-          rcvdistcomps replcomps replgroupcomps scan.MMDDYY \
+          mhn.defaults rcvdistcomps replcomps replgroupcomps scan.MMDDYY \
           scan.YYYYMMDD scan.default scan.mailx scan.nomime scan.size \
           scan.time scan.timely scan.unseen
   do
-    cp ${srcdir}/etc/${f} ${MH_TEST_DIR}/Mail || exit 1
-  done
-
-  for f in mhn.defaults mts.conf
-  do
-    cp ${MH_OBJ_DIR}/etc/${f} ${MH_TEST_DIR}/Mail || exit 1
+    cp ${MH_INST_DIR}${sysconfdir}/${f} ${MH_TEST_DIR}/Mail || exit 1
   done
 
   folder -create +inbox > /dev/null

http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=3439af1e13339ebd1c189f8afaae93a6d9fd27a7


commit 3439af1e13339ebd1c189f8afaae93a6d9fd27a7
Author: Ken Hornstein <address@hidden>
Date:   Fri Feb 10 23:22:12 2012 -0500

    Switch to using the "inst" version of mhl for tests.

diff --git a/Makefile.am b/Makefile.am
index e2aa952..84bf58f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,7 +37,7 @@ auxexecdir = @libdir@
 TESTS_ENVIRONMENT = MH_TEST_DIR=`pwd`/test/testdir \
                    MH_TEST_COMMON=`pwd`/test/common.sh \
                    MH_OBJ_DIR=`pwd` mandir=$(mandir) bindir=$(bindir) \
-                   sysconfdir=$(sysconfdir)
+                   sysconfdir=$(sysconfdir) auxexecdir=$(auxexecdir)
 ##
 ## Important note: the "cleanup" test should always be last
 ##
diff --git a/test/common.sh.in b/test/common.sh.in
index 4c7089c..adcb685 100644
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -84,7 +84,7 @@ setup_test ()
   mkdir $MH_TEST_DIR/Mail || exit 1
   cat > $MH <<EOF || exit 1
 Path: ${MH_TEST_DIR}/Mail
-mhlproc: ${MH_OBJ_DIR}/uip/mhl
+mhlproc: ${MH_INST_DIR}${auxexecdir}/mhl
 EOF
 
   for f in MailAliases components digestcomps distcomps forwcomps mhl.body \

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am       |    2 +-
 test/common.sh.in |   11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
The nmh Mail Handling System