[Nmh-commits] nmh test/runtest ChangeLog

[Peter Maydell]

CVSROOT:        /cvsroot/nmh
Module name:    nmh
Changes by:     Peter Maydell <pm215>   08/12/25 23:30:33

Modified files:
        test           : runtest 
        .              : ChangeLog 

Log message:
        test/runtest: automatically run setup-test if it hasn't already
        been done. Improve error handling in test script with 'set -e'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/nmh/test/runtest?cvsroot=nmh&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/nmh/ChangeLog?cvsroot=nmh&r1=1.299&r2=1.300

Patches:
Index: test/runtest
===================================================================
RCS file: /cvsroot/nmh/nmh/test/runtest,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/runtest        3 Aug 2008 15:13:34 -0000       1.3
+++ test/runtest        25 Dec 2008 23:30:33 -0000      1.4
@@ -1,6 +1,20 @@
 #!/bin/sh
 
+set -e
+
+if [ ! -e test-temp-dir ]; then
+   echo "test-temp-dir not found: running setup-test"
+   ./setup-test
+fi
+
 export MH_TEST_DIR=`cat test-temp-dir`
+
+if [ ! -e "$MH_TEST_DIR/bld/Makefile" ]; then
+   echo "temporary directory missing or broken: running setup-test"
+   ./setup-test
+   export MH_TEST_DIR=`cat test-temp-dir`
+fi   
+
 export MH=$MH_TEST_DIR/mh_profile
 export PATH=$MH_TEST_DIR/bin:$PATH
 
@@ -23,9 +37,10 @@
 done
 
 # now run the test
+set +e
 /bin/sh $1
-
 return_value=$?
+set -e
 
 if [ $return_value -eq 0 ] ; then
     echo Test $1 PASS

Index: ChangeLog
===================================================================
RCS file: /cvsroot/nmh/nmh/ChangeLog,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -b -r1.299 -r1.300
--- ChangeLog   23 Oct 2008 18:38:22 -0000      1.299
+++ ChangeLog   25 Dec 2008 23:30:33 -0000      1.300
@@ -1,3 +1,8 @@
+2008-08-03  Peter Maydell  <address@hidden>
+
+       * test/runtest: automatically run setup-test if it hasn't already
+       been done. Improve error handling in test script with 'set -e'.
+
 2008-10-23  David Levine <address@hidden>
 
        * h/mh.h: raised NAMESZ from 128 to 999.  RFC 2822 limits line