projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
whatnow: Simplified and clarified (or fixed?) the situation of failed edits.
[mmh]
/
test
/
runtest
diff --git
a/test/runtest
b/test/runtest
index
3d7a92b
..
0b18653
100755
(executable)
--- a/
test/runtest
+++ b/
test/runtest
@@
-1,13
+1,30
@@
#!/bin/sh
#!/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`
export MH_TEST_DIR=`cat test-temp-dir`
-export MH=$MH_TEST_DIR/mh_profile
+
+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/Mail/.mh_profile
export PATH=$MH_TEST_DIR/bin:$PATH
export PATH=$MH_TEST_DIR/bin:$PATH
+export MH_TEST_COMMON=$PWD/common.sh
+
# clean old test data
rm -rf $MH_TEST_DIR/Mail
# setup test data
mkdir $MH_TEST_DIR/Mail
# clean old test data
rm -rf $MH_TEST_DIR/Mail
# setup test data
mkdir $MH_TEST_DIR/Mail
+echo "Path: $MH_TEST_DIR/Mail" > $MH
folder -create +inbox > /dev/null
# create 10 basic messages
for i in `seq 1 10`;
folder -create +inbox > /dev/null
# create 10 basic messages
for i in `seq 1 10`;
@@
-23,12
+40,18
@@
EOF
done
# now run the test
done
# now run the test
+set +e
/bin/sh $1
/bin/sh $1
-
return_value=$?
return_value=$?
+set -e
if [ $return_value -eq 0 ] ; then
echo Test $1 PASS
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
else
echo Test $1 FAIL
fi