projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'format-memory-rework'
[mmh]
/
test
/
mhbuild
/
test-utf8-body
diff --git
a/test/mhbuild/test-utf8-body
b/test/mhbuild/test-utf8-body
index
e7cb2f8
..
47229de
100755
(executable)
--- a/
test/mhbuild/test-utf8-body
+++ b/
test/mhbuild/test-utf8-body
@@
-21,7
+21,7
@@
testname="${MH_TEST_DIR}/$$"
#### Rely on sendmail/pipe below to override default mts.
mts_fakesendmail="${MHMTSCONF}-fakesendmail"
cp "${MHMTSCONF}" "$mts_fakesendmail"
#### Rely on sendmail/pipe below to override default mts.
mts_fakesendmail="${MHMTSCONF}-fakesendmail"
cp "${MHMTSCONF}" "$mts_fakesendmail"
-printf "%s\n" "sendmail: ${srcdir}/test/fakesendmail" >>"$mts_fakesendmail"
+printf 'sendmail: %s/test/fakesendmail\n' "$srcdir" >>"$mts_fakesendmail"
MHMTSCONF="$mts_fakesendmail"
# argument: expected output
MHMTSCONF="$mts_fakesendmail"
# argument: expected output
@@
-34,18
+34,13
@@
test_attachment ()
inc -silent -file "$mbox"
rm -f "$mbox" "$mbox.map"
inc -silent -file "$mbox"
rm -f "$mbox" "$mbox.map"
- cur=`mhpath cur`
-
#
# It's hard to calculate the exact Date: header post is going to
# use, so we'll just use sed to remove the actual date so we can easily
#
# It's hard to calculate the exact Date: header post is going to
# use, so we'll just use sed to remove the actual date so we can easily
- # compare it against our "correct" output. And same for
- # Content-ID and charset.
+ # compare it against our "correct" output. And same for charset.
#
#
- sed -e 's/^Date:.*/Date:/' \
- -e 's/^Content-ID:.*/Content-ID:/' \
- -e 's/; charset=".*//' \
- "$cur" > "${testname}.actual"
+ sed -e 's/^Date:.*/Date:/' -e 's/; charset=".*//' \
+ "`mhpath cur`" > "${testname}.actual"
check "${testname}.actual" "$1"
}
check "${testname}.actual" "$1"
}
@@
-57,7
+52,7
@@
EOF
cat > "${MH_TEST_DIR}/Mail/draft" <<EOF
From: Mr Nobody <nobody@example.com>
cat > "${MH_TEST_DIR}/Mail/draft" <<EOF
From: Mr Nobody <nobody@example.com>
-To: Somebody Else <somebody@example.com>
+To: Somebody <somebody@example.com>
Subject: Test
Nmh-Attachment: $MH_TEST_DIR/attachment.txt
Subject: Test
Nmh-Attachment: $MH_TEST_DIR/attachment.txt
@@
-66,11
+61,10
@@
EOF
cat > "${testname}.expected" <<EOF
From: Mr Nobody <nobody@example.com>
cat > "${testname}.expected" <<EOF
From: Mr Nobody <nobody@example.com>
-To: Somebody Else <somebody@example.com>
+To: Somebody <somebody@example.com>
Subject: Test
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
Subject: Test
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
-Content-ID:
Date:
------- =_aaaaaaaaaa0
Date:
------- =_aaaaaaaaaa0
@@
-90,12
+84,12
@@
EOF
test_attachment "${testname}.expected"
test_attachment "${testname}.expected"
-# check that 8-bit body is still encoded as quoted-printable
-# text/plain, even with an attachment
+# check that 8-bit body is encoded as quoted-printable text/plain,
+# even with an attachment
cat > "${MH_TEST_DIR}/Mail/draft" <<EOF
From: Mr Nobody <nobody@example.com>
cat > "${MH_TEST_DIR}/Mail/draft" <<EOF
From: Mr Nobody <nobody@example.com>
-To: Somebody Else <somebody@example.com>
+To: Somebody <somebody@example.com>
Subject: Test
Nmh-Attachment: $MH_TEST_DIR/attachment.txt
Subject: Test
Nmh-Attachment: $MH_TEST_DIR/attachment.txt
@@
-104,11
+98,10
@@
EOF
cat > "${testname}.expected" <<EOF
From: Mr Nobody <nobody@example.com>
cat > "${testname}.expected" <<EOF
From: Mr Nobody <nobody@example.com>
-To: Somebody Else <somebody@example.com>
+To: Somebody <somebody@example.com>
Subject: Test
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
Subject: Test
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
-Content-ID:
Date:
------- =_aaaaaaaaaa0
Date:
------- =_aaaaaaaaaa0