X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Fruntest;h=4ec4a03e69e7191564a14cbdf067d541f9a4386f;hb=5b32b30305e864c22241dc1740a79fda9c269db7;hp=d970b183656ad2ea6d148b7a95b4a04bd0768a06;hpb=031871c2ede845956070da603e8494690f7beb70;p=mmh

diff --git a/test/runtest b/test/runtest
index d970b18..4ec4a03 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1,15 +1,54 @@
 #!/bin/sh
 
-export MH=`cat test-temp-dir`/mh_profile
+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
 
-/bin/sh $1
+# clean old test data
+rm -rf $MH_TEST_DIR/Mail
+# setup test data
+mkdir $MH_TEST_DIR/Mail
+folder -create +inbox > /dev/null
+# create 10 basic messages
+for i in `seq 1 10`;
+do
+    cat > $MH_TEST_DIR/Mail/inbox/$i <<EOF
+From: Test$i <test$i@example.com>
+To: Some User <user@example.com>
+Date: Fri, 29 Sep 2006 00:00:00
+Subject: Testing message $i
 
+This is message number $i
+EOF
+done
+
+# now run the test
+set +e
+/bin/sh $1
 return_value=$?
+set -e
 
 if [ $return_value -eq 0 ] ; then
     echo Test $1 PASS
+elif [ $return_value -eq 120 ]; then
+    # indicates test was skipped (eg needed program not found)
+    # test itself should have printed a message about this,
+    # so print nothing here.
+    :
 else
     echo Test $1 FAIL
 fi