projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
With -messageid random, make the part after the @ more resemble a
[mmh]
/
test
/
mhbuild
/
test-forw
diff --git
a/test/mhbuild/test-forw
b/test/mhbuild/test-forw
index
c92242f
..
448a17c
100755
(executable)
--- a/
test/mhbuild/test-forw
+++ b/
test/mhbuild/test-forw
@@
-5,23
+5,15
@@
#
######################################################
#
######################################################
-if [ -z "${MH_TEST_COMMON}" ]; then
- echo "MH_TEST_COMMON not set; try running via 'make check'"
+if test -z "${MH_OBJ_DIR}"; then
+ srcdir=`dirname "$0"`/../..
+ MH_OBJ_DIR=`cd "$srcdir" && pwd`; export MH_OBJ_DIR
fi
fi
-. ${MH_TEST_COMMON}
+. "$MH_OBJ_DIR/test/common.sh"
setup_test
setup_test
-# TODO: Move to a common file tests can source; need more framework...
-failed=0
-check() {
- diff -u $expected $actual
- if [ $? -ne 0 ]; then
- failed=$((failed + 1))
- fi
-}
-
# Make a draft file forwarding two messages.
mkdraft() {
cat > $draft <<EOF
# Make a draft file forwarding two messages.
mkdraft() {
cat > $draft <<EOF
@@
-40,9
+32,10
@@
mungedraft() {
sed 's/\(Content-ID:\) <[^>][^>]*>/\1 <TESTID>/' $draft > $actual
}
sed 's/\(Content-ID:\) <[^>][^>]*>/\1 <TESTID>/' $draft > $actual
}
-draft=$MH_TEST_DIR/$$.draft
-expected=$MH_TEST_DIR/$$.expected
-actual=$MH_TEST_DIR/$$.actual
+draft="$MH_TEST_DIR/$$.draft"
+draftorig="$MH_TEST_DIR/,$$.draft.orig"
+expected="$MH_TEST_DIR/$$.expected"
+actual="$MH_TEST_DIR/$$.actual"
# check mhbuild
cat > $expected <<EOF
# check mhbuild
cat > $expected <<EOF
@@
-80,7
+73,8
@@
EOF
mkdraft
mhbuild $draft
mungedraft
mkdraft
mhbuild $draft
mungedraft
-check
+check $expected $actual
+test ${failed:-0} -eq 0 && rm "$draft" "$draftorig"
# check mhbuild -rfc934
cat > $expected <<EOF
# check mhbuild -rfc934
cat > $expected <<EOF
@@
-117,6
+111,7
@@
EOF
mkdraft
mhbuild -rfc934 $draft
mungedraft
mkdraft
mhbuild -rfc934 $draft
mungedraft
-check
+check $expected $actual
+test ${failed:-0} -eq 0 && rm "$draft" "$draftorig"
exit $failed
exit $failed