summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac3
-rw-r--r--frm/tests/Makefile.am4
-rw-r--r--imap4d/testsuite/imap4d/fetch.exp36
-rw-r--r--mail/testsuite/mail/read.exp50
-rw-r--r--mail/testsuite/mail/write.exp20
-rw-r--r--mailbox/testsuite/Mime14
-rw-r--r--readmsg/Makefile.am2
-rw-r--r--readmsg/tests/.gitignore7
-rw-r--r--readmsg/tests/Makefile.am66
-rw-r--r--readmsg/tests/all.at205
-rw-r--r--readmsg/tests/atlocal.in7
-rw-r--r--readmsg/tests/hdr.at37
-rw-r--r--readmsg/tests/nohdr.at27
-rw-r--r--readmsg/tests/testsuite.at54
-rw-r--r--readmsg/tests/twomsg.at74
-rw-r--r--readmsg/tests/weed.at30
-rw-r--r--readmsg/testsuite/.gitignore7
-rw-r--r--readmsg/testsuite/Makefile.am89
-rw-r--r--readmsg/testsuite/readmsg/DISTFILES1
-rw-r--r--readmsg/testsuite/readmsg/test.exp309
-rw-r--r--sieve/tests/testsuite.at2
-rw-r--r--sieve/tests/version.at2
-rw-r--r--testsuite/spool/mbox110
-rw-r--r--testsuite/testsuite.inc7
24 files changed, 582 insertions, 481 deletions
diff --git a/configure.ac b/configure.ac
index 8e1de2d5d..c7babe753 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1213,6 +1213,8 @@ AC_ARG_WITH([mh-bindir],
AC_CONFIG_TESTDIR(tests)
AC_CONFIG_FILES([frm/tests/Makefile
frm/tests/atlocal
+ readmsg/tests/Makefile
+ readmsg/tests/atlocal
sieve/tests/Makefile
sieve/tests/atlocal])
AM_MISSING_PROG([AUTOM4TE], [autom4te])
@@ -1373,7 +1375,6 @@ AC_CONFIG_FILES([
python/libmu_py/Makefile
python/mailutils/Makefile
readmsg/Makefile
- readmsg/testsuite/Makefile
mu-aux/Makefile
mu-aux/mailutils.spec
sieve/Makefile
diff --git a/frm/tests/Makefile.am b/frm/tests/Makefile.am
index a361bbea6..647d10843 100644
--- a/frm/tests/Makefile.am
+++ b/frm/tests/Makefile.am
@@ -38,9 +38,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
## Test suite. ##
## ------------ ##
-TESTSUITE_AT = \
- testsuite.at\
- version.at
+TESTSUITE_AT = testsuite.at
TESTSUITE = $(srcdir)/testsuite
M4=m4
diff --git a/imap4d/testsuite/imap4d/fetch.exp b/imap4d/testsuite/imap4d/fetch.exp
index e61f3b51b..005282f14 100644
--- a/imap4d/testsuite/imap4d/fetch.exp
+++ b/imap4d/testsuite/imap4d/fetch.exp
@@ -78,11 +78,11 @@ imap4d_test "FETCH 1:* ENVELOPE"\
# RFC822.SIZE ENVELOPE)
imap4d_test "FETCH 1:\* ALL"\
-"1 FETCH (FLAGS (\\Recent) INTERNALDATE \"28-Dec-2001 22:18:09 +0000\" RFC822.SIZE 1299 ENVELOPE (\"Fri, 28 Dec 2001 22:18:08 +0200\" \"Jabberwocky\" ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) NIL NIL NIL \"<200112282018.fBSKI8N04906@nonexistent.net>\"))"\
-"2 FETCH (FLAGS (\\Recent) INTERNALDATE \"28-Dec-2001 23:28:09 +0000\" RFC822.SIZE 548 ENVELOPE (\"Fri, 28 Dec 2001 23:28:08 +0200\" \"Re: Jabberwocky\" ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL NIL \"<200112232808.fERKR9N16790@dontmailme.org>\"))"\
-"3 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:43:18 +0000\" RFC822.SIZE 1668 ENVELOPE (\"Sat, 13 Jul 2002 00:43:18 +0300\" \"Simple MIME\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL NIL \"<200207122143.g6CLhIb05086@Mirddin.farlep.net>\"))"\
-"4 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:50:58 +0000\" RFC822.SIZE 3568 ENVELOPE (\"Sat, 13 Jul 2002 00:50:58 +0300\" \"Nested MIME\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL NIL \"<200207122150.g6CLowb05126@Mirddin.farlep.net>\"))"\
-"5 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:43:18 +0000\" RFC822.SIZE 941 ENVELOPE (\"Sat, 13 Jul 2002 00:43:18 +0300\" \"Empty MIME Parts\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL NIL \"<200207122143.g6CLhIb05086@Mirddin.farlep.net>\"))"\
+"1 FETCH (FLAGS (\\Recent) INTERNALDATE \"28-Dec-2001 22:18:09 +0000\" RFC822.SIZE 1298 ENVELOPE (\"Fri, 28 Dec 2001 22:18:08 +0200\" \"Jabberwocky\" ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) NIL NIL NIL \"<200112282018.fBSKI8N04906@nonexistent.net>\"))"\
+"2 FETCH (FLAGS (\\Recent) INTERNALDATE \"28-Dec-2001 23:28:09 +0000\" RFC822.SIZE 547 ENVELOPE (\"Fri, 28 Dec 2001 23:28:08 +0200\" \"Re: Jabberwocky\" ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL NIL \"<200112232808.fERKR9N16790@dontmailme.org>\"))"\
+"3 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:43:18 +0000\" RFC822.SIZE 1667 ENVELOPE (\"Sat, 13 Jul 2002 00:43:18 +0300\" \"Simple MIME\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL NIL \"<200207122143.g6CLhIb05086@Mirddin.farlep.net>\"))"\
+"4 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:50:58 +0000\" RFC822.SIZE 3567 ENVELOPE (\"Sat, 13 Jul 2002 00:50:58 +0300\" \"Nested MIME\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL NIL \"<200207122150.g6CLowb05126@Mirddin.farlep.net>\"))"\
+"5 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:43:18 +0000\" RFC822.SIZE 940 ENVELOPE (\"Sat, 13 Jul 2002 00:43:18 +0300\" \"Empty MIME Parts\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL NIL \"<200207122143.g6CLhIb05086@Mirddin.farlep.net>\"))"\
"OK"
# BODYSTRUCTURE The [MIME-IMB] body structure of the message. This
@@ -124,9 +124,9 @@ imap4d_test "FETCH 1:* BODY"\
# implicitly set the \Seen flag.
imap4d_test "FETCH 1 BODY.PEEK\[HEADER\]"\
-"1 FETCH (BODY\[HEADER\] {327}"\
+"1 FETCH (BODY\[HEADER\] {326}"\
-literal\
-"Received: (from foobar@nonexistent.net) "\
+"Received: (from foobar@nonexistent.net)"\
" by nonexistent.net id fBSKI8N04906"\
" for bar@dontmailme.org; Fri, 28 Dec 2001 22:18:08 +0200"\
"Date: Fri, 28 Dec 2001 22:18:08 +0200"\
@@ -144,9 +144,9 @@ imap4d_test "FETCH 1 BODY.PEEK\[HEADER\]"\
# MESSAGE/RFC822 message.
imap4d_test "FETCH 1 BODY\[HEADER\]"\
-"1 FETCH (FLAGS (\\Seen) BODY\[HEADER\] {327}"\
+"1 FETCH (FLAGS (\\Seen) BODY\[HEADER\] {326}"\
-literal\
-"Received: (from foobar@nonexistent.net) "\
+"Received: (from foobar@nonexistent.net)"\
" by nonexistent.net id fBSKI8N04906"\
" for bar@dontmailme.org; Fri, 28 Dec 2001 22:18:08 +0200"\
"Date: Fri, 28 Dec 2001 22:18:08 +0200"\
@@ -179,9 +179,9 @@ imap4d_test "FETCH 1 BODY\[HEADER.FIELDS (FROM TO SUBJECT)\]"\
# the header fields with a non-matching field-name.
imap4d_test "FETCH 1 BODY\[HEADER.FIELDS.NOT (FROM TO SUBJECT)\]"\
-"1 FETCH (BODY\[HEADER.FIELDS.NOT (FROM TO SUBJECT)\] {235}"\
+"1 FETCH (BODY\[HEADER.FIELDS.NOT (FROM TO SUBJECT)\] {234}"\
-literal\
-"Received: (from foobar@nonexistent.net) "\
+"Received: (from foobar@nonexistent.net)"\
" by nonexistent.net id fBSKI8N04906"\
" for bar@dontmailme.org; Fri, 28 Dec 2001 22:18:08 +0200"\
"Date: Fri, 28 Dec 2001 22:18:08 +0200"\
@@ -419,9 +419,9 @@ imap4d_test "STORE 1:* -FLAGS (\\Seen)"\
# is returned).
imap4d_test "FETCH 1 RFC822"\
-"1 FETCH (FLAGS (\\Seen) RFC822 {1299}"\
+"1 FETCH (FLAGS (\\Seen) RFC822 {1298}"\
-literal\
-"Received: (from foobar@nonexistent.net) "\
+"Received: (from foobar@nonexistent.net)"\
" by nonexistent.net id fBSKI8N04906"\
" for bar@dontmailme.org; Fri, 28 Dec 2001 22:18:08 +0200"\
"Date: Fri, 28 Dec 2001 22:18:08 +0200"\
@@ -473,9 +473,9 @@ imap4d_test "FETCH 1 RFC822"\
# FETCH data (RFC822.HEADER is returned).
imap4d_test "FETCH 2 RFC822.HEADER"\
-"2 FETCH (RFC822.HEADER {329}"\
+"2 FETCH (RFC822.HEADER {328}"\
-literal\
-"Received: (from bar@dontmailme.org) "\
+"Received: (from bar@dontmailme.org)"\
" by dontmailme.org id fERKR9N16790"\
" for foobar@nonexistent.net; Fri, 28 Dec 2001 22:18:08 +0200"\
"Date: Fri, 28 Dec 2001 23:28:08 +0200"\
@@ -490,7 +490,7 @@ imap4d_test "FETCH 2 RFC822.HEADER"\
# RFC822.SIZE The [RFC-822] size of the message.
imap4d_test "FETCH 3 RFC822.SIZE"\
-"3 FETCH (RFC822.SIZE 1668)"\
+"3 FETCH (RFC822.SIZE 1667)"\
"OK"
# RFC822.TEXT Functionally equivalent to BODY[TEXT], differing in
@@ -510,14 +510,14 @@ imap4d_test "FETCH 2 RFC822.TEXT"\
# RFC822.SIZE)
imap4d_test "FETCH 1 FAST" \
-"1 FETCH (FLAGS (\\Seen \\Recent) INTERNALDATE \"28-Dec-2001 22:18:09 +0000\" RFC822.SIZE 1299)"\
+"1 FETCH (FLAGS (\\Seen \\Recent) INTERNALDATE \"28-Dec-2001 22:18:09 +0000\" RFC822.SIZE 1298)"\
"OK"
# FULL Macro equivalent to: (FLAGS INTERNALDATE
# RFC822.SIZE ENVELOPE BODY)
imap4d_test "FETCH 4 FULL"\
-"4 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:50:58 +0000\" RFC822.SIZE 3568 ENVELOPE (\"Sat, 13 Jul 2002 00:50:58 +0300\" \"Nested MIME\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL NIL \"<200207122150.g6CLowb05126@Mirddin.farlep.net>\") BODY ((\"text\" \"plain\" (\"name\" \"msg.21\" \"charset\" \"us-ascii\") \"<5122.1026510654.2@Mirddin.farlep.net>\" \"Father William Part I\" \"7BIT\" 351 10)((\"application\" \"octet-stream\" (\"name\" \"msg.22\") \"<5122.1026510654.4@Mirddin.farlep.net>\" \"Father William Part II\" \"base64\" 486)((\"application\" \"octet-stream\" (\"name\" \"msg.23\") \"<5122.1026510654.6@Mirddin.farlep.net>\" \"Father William Part III\" \"base64\" 490)(\"application\" \"octet-stream\" (\"name\" \"msg.24\") \"<5122.1026510654.7@Mirddin.farlep.net>\" \"Father William Part IV\" \"base64\" 502) \"mixed\" NIL NIL NIL) \"mixed\" NIL NIL NIL) \"mixed\" NIL NIL NIL))"\
+"4 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:50:58 +0000\" RFC822.SIZE 3567 ENVELOPE (\"Sat, 13 Jul 2002 00:50:58 +0300\" \"Nested MIME\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL NIL \"<200207122150.g6CLowb05126@Mirddin.farlep.net>\") BODY ((\"text\" \"plain\" (\"name\" \"msg.21\" \"charset\" \"us-ascii\") \"<5122.1026510654.2@Mirddin.farlep.net>\" \"Father William Part I\" \"7BIT\" 351 10)((\"application\" \"octet-stream\" (\"name\" \"msg.22\") \"<5122.1026510654.4@Mirddin.farlep.net>\" \"Father William Part II\" \"base64\" 486)((\"application\" \"octet-stream\" (\"name\" \"msg.23\") \"<5122.1026510654.6@Mirddin.farlep.net>\" \"Father William Part III\" \"base64\" 490)(\"application\" \"octet-stream\" (\"name\" \"msg.24\") \"<5122.1026510654.7@Mirddin.farlep.net>\" \"Father William Part IV\" \"base64\" 502) \"mixed\" NIL NIL NIL) \"mixed\" NIL NIL NIL) \"mixed\" NIL NIL NIL))"\
"OK"
imap4d_stop
diff --git a/mail/testsuite/mail/read.exp b/mail/testsuite/mail/read.exp
index 5d6d9ac62..fbb52aec4 100644
--- a/mail/testsuite/mail/read.exp
+++ b/mail/testsuite/mail/read.exp
@@ -27,21 +27,21 @@ mail_command "set readonly"
# line and a delimiter line between headers and the body. Thus, number
# of lines is always two less then reported by BSD mail.
mail_test "size *" \
-"> 1 44/1255 "\
-" 2 13/535 "\
-" 3 42/1626 "\
-" 4 84/3484 "
+"> 1 44/1254 "\
+" 2 13/534 "\
+" 3 42/1625 "\
+" 4 84/3483 "
###########################################################################
# `headers' and `print'
mail_test "headers" \
-">N 1 Foo Bar Fri Dec 28 22:18 44/1255 Jabberwocky" \
-" N 2 Bar Fri Dec 28 23:28 13/535 Re: Jabberwocky" \
-" N 3 Sergey Poznyakoff Sat Jul 13 00:43 42/1626 Simple MIME" \
-" N 4 Sergey Poznyakoff Sat Jul 13 00:50 84/3484 Nested MIME" \
+">N 1 Foo Bar Fri Dec 28 22:18 44/1254 Jabberwocky" \
+" N 2 Bar Fri Dec 28 23:28 13/534 Re: Jabberwocky" \
+" N 3 Sergey Poznyakoff Sat Jul 13 00:43 42/1625 Simple MIME" \
+" N 4 Sergey Poznyakoff Sat Jul 13 00:50 84/3483 Nested MIME" \
mail_test "print"\
- "Received: (from foobar@nonexistent.net) "\
+ "Received: (from foobar@nonexistent.net)"\
" by nonexistent.net id fBSKI8N04906"\
" for bar@dontmailme.org; Fri, 28 Dec 2001 22:18:08 +0200"\
"Date: Fri, 28 Dec 2001 22:18:08 +0200"\
@@ -87,7 +87,7 @@ mail_test "print"\
# Initially, `Print' must yield the same output as `print'
mail_test "Print"\
- "Received: (from foobar@nonexistent.net) "\
+ "Received: (from foobar@nonexistent.net)"\
" by nonexistent.net id fBSKI8N04906"\
" for bar@dontmailme.org; Fri, 28 Dec 2001 22:18:08 +0200"\
"Date: Fri, 28 Dec 2001 22:18:08 +0200"\
@@ -135,7 +135,7 @@ mail_test "Print"\
# Test the `top' command
mail_test "top" \
- "Received: (from foobar@nonexistent.net) "\
+ "Received: (from foobar@nonexistent.net)"\
" by nonexistent.net id fBSKI8N04906"\
" for bar@dontmailme.org; Fri, 28 Dec 2001 22:18:08 +0200"\
"Date: Fri, 28 Dec 2001 22:18:08 +0200"\
@@ -158,16 +158,16 @@ mail_test -message "top (2)" "top" \
# This checks if `headers' correctly reflects 'read' attribute
mail_test -message "headers (2)" "headers" \
-">R 1 Foo Bar Fri Dec 28 22:18 44/1255 Jabberwocky" \
-" N 2 Bar Fri Dec 28 23:28 13/535 Re: Jabberwocky" \
-" N 3 Sergey Poznyakoff Sat Jul 13 00:43 42/1626 Simple MIME" \
-" N 4 Sergey Poznyakoff Sat Jul 13 00:50 84/3484 Nested MIME" \
+">R 1 Foo Bar Fri Dec 28 22:18 44/1254 Jabberwocky" \
+" N 2 Bar Fri Dec 28 23:28 13/534 Re: Jabberwocky" \
+" N 3 Sergey Poznyakoff Sat Jul 13 00:43 42/1625 Simple MIME" \
+" N 4 Sergey Poznyakoff Sat Jul 13 00:50 84/3483 Nested MIME" \
###########################################################################
# `next' should display the 2nd message
mail_test "next" \
-"Received: (from bar@dontmailme.org) "\
+"Received: (from bar@dontmailme.org)"\
" by dontmailme.org id fERKR9N16790"\
" for foobar@nonexistent.net; Fri, 28 Dec 2001 22:18:08 +0200"\
"Date: Fri, 28 Dec 2001 23:28:08 +0200"\
@@ -185,10 +185,10 @@ mail_test "next" \
# Now check if the cursor is placed correctly
mail_test -message "headers (3)" "headers" \
-" R 1 Foo Bar Fri Dec 28 22:18 44/1255 Jabberwocky" \
-">R 2 Bar Fri Dec 28 23:28 13/535 Re: Jabberwocky" \
-" N 3 Sergey Poznyakoff Sat Jul 13 00:43 42/1626 Simple MIME" \
-" N 4 Sergey Poznyakoff Sat Jul 13 00:50 84/3484 Nested MIME" \
+" R 1 Foo Bar Fri Dec 28 22:18 44/1254 Jabberwocky" \
+">R 2 Bar Fri Dec 28 23:28 13/534 Re: Jabberwocky" \
+" N 3 Sergey Poznyakoff Sat Jul 13 00:43 42/1625 Simple MIME" \
+" N 4 Sergey Poznyakoff Sat Jul 13 00:50 84/3483 Nested MIME" \
###########################################################################
# Check for `prev'
@@ -212,16 +212,16 @@ mail_test "prev"\
# `headers' again
mail_test -message "headers (4)" "headers" \
-">R 1 Foo Bar Fri Dec 28 22:18 44/1255 Jabberwocky" \
-" R 2 Bar Fri Dec 28 23:28 13/535 Re: Jabberwocky" \
-" N 3 Sergey Poznyakoff Sat Jul 13 00:43 42/1626 Simple MIME" \
-" N 4 Sergey Poznyakoff Sat Jul 13 00:50 84/3484 Nested MIME" \
+">R 1 Foo Bar Fri Dec 28 22:18 44/1254 Jabberwocky" \
+" R 2 Bar Fri Dec 28 23:28 13/534 Re: Jabberwocky" \
+" N 3 Sergey Poznyakoff Sat Jul 13 00:43 42/1625 Simple MIME" \
+" N 4 Sergey Poznyakoff Sat Jul 13 00:50 84/3483 Nested MIME" \
###########################################################################
# print with an argument
mail_test -message "print (2)" "print 2"\
-"Received: (from bar@dontmailme.org) "\
+"Received: (from bar@dontmailme.org)"\
" by dontmailme.org id fERKR9N16790"\
" for foobar@nonexistent.net; Fri, 28 Dec 2001 22:18:08 +0200"\
"Date: Fri, 28 Dec 2001 23:28:08 +0200"\
diff --git a/mail/testsuite/mail/write.exp b/mail/testsuite/mail/write.exp
index 4f3ebf48b..d2cce6ffa 100644
--- a/mail/testsuite/mail/write.exp
+++ b/mail/testsuite/mail/write.exp
@@ -42,16 +42,16 @@ mail_test "delete" "No applicable messages"
# Start again using the same mailbox
mail_start -reuse-spool "--file=%mbox1"
mail_test "h" \
- ">U 1 Bar Fri Dec 28 23:28 16/579 Re: Jabberwocky"\
- " U 2 Sergey Poznyakoff Sat Jul 13 00:43 44/1645 Simple MIME"\
- " U 3 Sergey Poznyakoff Sat Jul 13 00:43 29/933 Empty MIME Parts"
+ ">U 1 Bar Fri Dec 28 23:28 16/578 Re: Jabberwocky"\
+ " U 2 Sergey Poznyakoff Sat Jul 13 00:43 44/1644 Simple MIME"\
+ " U 3 Sergey Poznyakoff Sat Jul 13 00:43 29/932 Empty MIME Parts"
# Send first message to mbox...
mail_command "mbox 1"
mail_test "h" \
- ">M 1 Bar Fri Dec 28 23:28 16/579 Re: Jabberwocky"\
- " U 2 Sergey Poznyakoff Sat Jul 13 00:43 44/1645 Simple MIME"\
- " U 3 Sergey Poznyakoff Sat Jul 13 00:43 29/933 Empty MIME Parts"
+ ">M 1 Bar Fri Dec 28 23:28 16/578 Re: Jabberwocky"\
+ " U 2 Sergey Poznyakoff Sat Jul 13 00:43 44/1644 Simple MIME"\
+ " U 3 Sergey Poznyakoff Sat Jul 13 00:43 29/932 Empty MIME Parts"
# ... and quit
mail_test -noprompt "quit" \
@@ -62,16 +62,16 @@ mail_test -noprompt "quit" \
mail_start -reuse-spool "--file=%mbox"
mail_test "headers" \
">N 1 Sergey Poznyakoff Tue Jul 16 12:11 12/425 MBOX"\
- " U 2 Bar Fri Dec 28 23:28 16/579 Re: Jabberwocky"
+ " U 2 Bar Fri Dec 28 23:28 16/578 Re: Jabberwocky"
# Save messages to the third mailbox
mail_command "set folder=\"$MU_FOLDER_DIR\""
mail_test "save 1 2 +three" \
- "\"$MU_FOLDER_DIR/three\" 28/1004"
+ "\"$MU_FOLDER_DIR/three\" 28/1003"
mail_test "headers" \
">* 1 Sergey Poznyakoff Tue Jul 16 12:11 12/425 MBOX"\
- " * 2 Bar Fri Dec 28 23:28 16/579 Re: Jabberwocky"
+ " * 2 Bar Fri Dec 28 23:28 16/578 Re: Jabberwocky"
mail_test -noprompt "quit" \
"Held 2 messages in $MU_SPOOL_DIR/mbox"
@@ -80,7 +80,7 @@ mail_test -noprompt "quit" \
mail_start -reuse-spool "--file=$MU_FOLDER_DIR/three"
mail_test "headers" \
">N 1 Sergey Poznyakoff Tue Jul 16 12:11 12/425 MBOX"\
- " U 2 Bar Fri Dec 28 23:28 16/579 Re: Jabberwocky"
+ " U 2 Bar Fri Dec 28 23:28 16/578 Re: Jabberwocky"
# Test uppercase commands (Save and Copy)
mail_command "set outfolder=\"$MU_FOLDER_DIR\""
diff --git a/mailbox/testsuite/Mime b/mailbox/testsuite/Mime
index 39cb23834..147c16ea4 100644
--- a/mailbox/testsuite/Mime
+++ b/mailbox/testsuite/Mime
@@ -21,9 +21,9 @@ Message: 1
From: Foo Bar <foobar@nonexistent.net>
Subject: Jabberwocky
Number of parts in message - 1
-Total message size - 1255/44
+Total message size - 1254/44
Type of part 1 =
-Message part size - 1255/44: 318/9, 937/35
+Message part size - 1254/44: 317/9, 937/35
Text Message
Begin
`Twas brillig, and the slithy toves
@@ -67,9 +67,9 @@ Message: 2
From: Bar <bar@dontmailme.org>
Subject: Re: Jabberwocky
Number of parts in message - 1
-Total message size - 535/13
+Total message size - 534/13
Type of part 1 =
-Message part size - 535/13: 320/9, 215/4
+Message part size - 534/13: 319/9, 215/4
Text Message
Begin
It seems very pretty, but it's *rather* hard to understand!'
@@ -82,7 +82,7 @@ Message: 3
From: Sergey Poznyakoff <gray@Mirddin.farlep.net>
Subject: Simple MIME
Number of parts in message - 2
-Total message size - 1626/42
+Total message size - 1625/42
Type of part 1 = text/plain
Message part size - 371/13: 141/4, 230/9
Text Message
@@ -118,7 +118,7 @@ Message: 4
From: Sergey Poznyakoff <gray@Mirddin.farlep.net>
Subject: Nested MIME
Number of parts in message - 2
-Total message size - 3484/84
+Total message size - 3483/84
Type of part 1 = text/plain
Message part size - 496/14: 155/4, 341/10
Text Message
@@ -196,7 +196,7 @@ Message: 5
From: Sergey Poznyakoff <gray@Mirddin.farlep.net>
Subject: Empty MIME Parts
Number of parts in message - 2
-Total message size - 914/27
+Total message size - 913/27
Type of part 1 = text/plain
Message part size - 143/4: 143/4, 0/0
Text Message
diff --git a/readmsg/Makefile.am b/readmsg/Makefile.am
index d22141fdd..844b1fe17 100644
--- a/readmsg/Makefile.am
+++ b/readmsg/Makefile.am
@@ -20,7 +20,7 @@
INCLUDES = @MU_APP_COMMON_INCLUDES@
-SUBDIRS = testsuite
+SUBDIRS = tests
bin_PROGRAMS = readmsg
readmsg_SOURCES = readmsg.c msglist.c readmsg.h
diff --git a/readmsg/tests/.gitignore b/readmsg/tests/.gitignore
new file mode 100644
index 000000000..33e4e9a57
--- /dev/null
+++ b/readmsg/tests/.gitignore
@@ -0,0 +1,7 @@
+atconfig
+atlocal
+package.m4
+status.mf
+testsuite
+testsuite.dir
+testsuite.log
diff --git a/readmsg/tests/Makefile.am b/readmsg/tests/Makefile.am
new file mode 100644
index 000000000..69c08a9ae
--- /dev/null
+++ b/readmsg/tests/Makefile.am
@@ -0,0 +1,66 @@
+# This file is part of GNU Mailutils.
+# Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+#
+# GNU Mailutils is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
+
+EXTRA_DIST = $(TESTSUITE_AT) testsuite package.m4
+DISTCLEANFILES = atconfig $(check_SCRIPTS)
+MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
+
+## ------------ ##
+## package.m4. ##
+## ------------ ##
+
+$(srcdir)/package.m4: $(top_srcdir)/configure.ac
+ { \
+ echo '# Signature of the current package.'; \
+ echo 'm4_define([AT_PACKAGE_NAME], [@PACKAGE_NAME@])'; \
+ echo 'm4_define([AT_PACKAGE_TARNAME], [@PACKAGE_TARNAME@])'; \
+ echo 'm4_define([AT_PACKAGE_VERSION], [@PACKAGE_VERSION@])'; \
+ echo 'm4_define([AT_PACKAGE_STRING], [@PACKAGE_STRING@])'; \
+ echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
+ } >$(srcdir)/package.m4
+
+#
+
+## ------------ ##
+## Test suite. ##
+## ------------ ##
+
+TESTSUITE_AT = \
+ all.at\
+ testsuite.at
+
+TESTSUITE = $(srcdir)/testsuite
+M4=m4
+
+AUTOTEST = $(AUTOM4TE) --language=autotest
+$(TESTSUITE): package.m4 $(TESTSUITE_AT)
+ $(AM_V_GEN)$(AUTOTEST) -I $(srcdir) -I $(top_srcdir)/testsuite testsuite.at -o $@.tmp
+ $(AM_V_at)mv $@.tmp $@
+
+atconfig: $(top_builddir)/config.status
+ cd $(top_builddir) && ./config.status tests/$@
+
+clean-local:
+ @test ! -f $(TESTSUITE) || $(SHELL) $(TESTSUITE) --clean
+
+check-local: atconfig atlocal $(TESTSUITE)
+ @$(SHELL) $(TESTSUITE)
+
+# Run the test suite on the *installed* tree.
+#installcheck-local:
+# $(SHELL) $(TESTSUITE) AUTOTEST_PATH=$(exec_prefix)/bin
+
+
diff --git a/readmsg/tests/all.at b/readmsg/tests/all.at
new file mode 100644
index 000000000..741d37d68
--- /dev/null
+++ b/readmsg/tests/all.at
@@ -0,0 +1,205 @@
+# This file is part of GNU Mailutils. -*- Autotest -*-
+# Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+#
+# GNU Mailutils is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of Mailfromd testsuite.
+
+READMSGTEST([readmsg *],[readmsg00],
+['*'],
+[0],
+[Date: Fri, 28 Dec 2001 22:18:08 +0200
+From: Foo Bar <foobar@nonexistent.net>
+To: Bar <bar@dontmailme.org>
+Subject: Jabberwocky
+
+`Twas brillig, and the slithy toves
+Did gyre and gimble in the wabe;
+All mimsy were the borogoves,
+And the mome raths outgrabe.
+
+`Beware the Jabberwock, my son!
+The jaws that bite, the claws that catch!
+Beware the Jujub bird, and shun
+The frumious Bandersnatch!'
+
+He took his vorpal sword in hand:
+Long time the manxome foe he sought --
+So rested he by the Tumtum gree,
+And stood awhile in thought.
+
+And as in uffish thought he stood,
+The Jabberwock, with eyes of flame,
+Came whiffling through the tulgey wook,
+And burbled as it came!
+
+One, two! One, two! And through and through
+The vorpal blade went snicker-snack!
+He left it dead, and with its head
+He went galumphing back.
+
+`And has thou slain the Jabberwock?
+Come to my arms, my beamish boy!
+O frabjous day! Calloh! Callay!
+He chortled in his joy.
+
+`Twas brillig, and the slithy toves
+Did gyre and gimble in the wabe;
+All mimsy were the borogoves,
+And the mome raths outgrabe.
+
+
+Date: Fri, 28 Dec 2001 23:28:08 +0200
+From: Bar <bar@dontmailme.org>
+To: Foo Bar <foobar@nonexistent.net>
+Subject: Re: Jabberwocky
+
+It seems very pretty, but it's *rather* hard to understand!'
+Somehow it seems to fill my head with ideas -- only I don't
+exactly know what they are! However, SOMEBODY killed SOMETHING:
+that's clear, at any rate...
+
+To: Foo Bar <foobar@nonexistent.net>
+Subject: Simple MIME
+Date: Sat, 13 Jul 2002 00:43:18 +0300
+From: Sergey Poznyakoff <gray@Mirddin.farlep.net>
+
+------- =_aaaaaaaaaa0
+Content-Type: text/plain; name="msg.1"; charset="us-ascii"
+Content-ID: <5082.1026510189.1@Mirddin.farlep.net>
+Content-Description: How doth
+
+How doth the little crocodile
+Improve his shining tail,
+And pour the waters of the Nile
+On every golden scale!
+
+`How cheerfully he seems to grin,
+How neatly spread his claws,
+And welcome little fishes in
+With gently smiling jaws!
+
+------- =_aaaaaaaaaa0
+Content-Type: application/octet-stream; name="msg.21"
+Content-ID: <5082.1026510189.2@Mirddin.farlep.net>
+Content-Description: Father William Part I
+Content-Transfer-Encoding: base64
+
+YFlvdSBhcmUgb2xkLCBGYXRoZXIgV2lsbGlhbSwnIHRoZSB5b3VuZyBtYW4gc2FpZCwKYEFuZCB5
+b3VyIGhhaXIgaGFzIGJlY29tZSB2ZXJ5IHdoaXRlOwpBbmQgeWV0IHlvdSBpbmNlc3NhbnRseSBz
+dGFuZCBvbiB5b3VyIGhlYWQtLQpEbyB5b3UgdGhpbmssIGF0IHlvdXIgYWdlLCBpdCBpcyByaWdo
+dD8nCgpgSW4gbXkgeW91dGgsJyBGYXRoZXIgV2lsbGlhbSByZXBsaWVkIHRvIGhpcyBzb24sCmBJ
+IGZlYXJlZCBpdCBtaWdodCBpbmp1cmUgdGhlIGJyYWluOwpCdXQsIG5vdyB0aGF0IEknbSBwZXJm
+ZWN0bHkgc3VyZSBJIGhhdmUgbm9uZSwKV2h5LCBJIGRvIGl0IGFnYWluIGFuZCBhZ2Fpbi4nCgo=
+
+------- =_aaaaaaaaaa0--
+
+To: Foo Bar <foobar@nonexistent.net>
+Subject: Nested MIME
+Date: Sat, 13 Jul 2002 00:50:58 +0300
+From: Sergey Poznyakoff <gray@Mirddin.farlep.net>
+
+------- =_aaaaaaaaaa0
+Content-Type: text/plain; name="msg.21"; charset="us-ascii"
+Content-ID: <5122.1026510654.2@Mirddin.farlep.net>
+Content-Description: Father William Part I
+
+`You are old, Father William,' the young man said,
+`And your hair has become very white;
+And yet you incessantly stand on your head--
+Do you think, at your age, it is right?'
+
+`In my youth,' Father William replied to his son,
+`I feared it might injure the brain;
+But, now that I'm perfectly sure I have none,
+Why, I do it again and again.'
+
+
+------- =_aaaaaaaaaa0
+Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa1"
+Content-ID: <5122.1026510654.3@Mirddin.farlep.net>
+
+------- =_aaaaaaaaaa1
+Content-Type: application/octet-stream; name="msg.22"
+Content-ID: <5122.1026510654.4@Mirddin.farlep.net>
+Content-Description: Father William Part II
+Content-Transfer-Encoding: base64
+
+YFlvdSBhcmUgb2xkLCcgc2FpZCB0aGUgeW91dGgsIGBhcyBJIG1lbnRpb25lZCBiZWZvcmUsCkFu
+ZCBoYXZlIGdyb3duIG1vc3QgdW5jb21tb25seSBmYXQ7CllldCB5b3UgdHVybmVkIGEgYmFjay1z
+b21lcnNhdWx0IGluIGF0IHRoZSBkb29yLS0KUHJheSwgd2hhdCBpcyB0aGUgcmVhc29uIG9mIHRo
+YXQ/JwoKYEluIG15IHlvdXRoLCcgc2FpZCB0aGUgc2FnZSwgYXMgaGUgc2hvb2sgaGlzIGdyZXkg
+bG9ja3MsCmBJIGtlcHQgYWxsIG15IGxpbWJzIHZlcnkgc3VwcGxlCkJ5IHRoZSB1c2Ugb2YgdGhp
+cyBvaW50bWVudC0tb25lIHNoaWxsaW5nIHRoZSBib3gtLQpBbGxvdyBtZSB0byBzZWxsIHlvdSBh
+IGNvdXBsZT8nCg==
+
+------- =_aaaaaaaaaa1
+Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa2"
+Content-ID: <5122.1026510654.5@Mirddin.farlep.net>
+
+------- =_aaaaaaaaaa2
+Content-Type: application/octet-stream; name="msg.23"
+Content-ID: <5122.1026510654.6@Mirddin.farlep.net>
+Content-Description: Father William Part III
+Content-Transfer-Encoding: base64
+
+YFlvdSBhcmUgb2xkLCcgc2FpZCB0aGUgeW91dGgsIGBhbmQgeW91ciBqYXdzIGFyZSB0b28gd2Vh
+awpGb3IgYW55dGhpbmcgdG91Z2hlciB0aGFuIHN1ZXQ7CllldCB5b3UgZmluaXNoZWQgdGhlIGdv
+b3NlLCB3aXRoIHRoZSBib25lcyBhbmQgdGhlIGJlYWstLQpQcmF5IGhvdyBkaWQgeW91IG1hbmFn
+ZSB0byBkbyBpdD8nCgpgSW4gbXkgeW91dGgsJyBzYWlkIGhpcyBmYXRoZXIsIGBJIHRvb2sgdG8g
+dGhlIGxhdywKQW5kIGFyZ3VlZCBlYWNoIGNhc2Ugd2l0aCBteSB3aWZlOwpBbmQgdGhlIG11c2N1
+bGFyIHN0cmVuZ3RoLCB3aGljaCBpdCBnYXZlIHRvIG15IGphdywKSGFzIGxhc3RlZCB0aGUgcmVz
+dCBvZiBteSBsaWZlLicK
+
+------- =_aaaaaaaaaa2
+Content-Type: application/octet-stream; name="msg.24"
+Content-ID: <5122.1026510654.7@Mirddin.farlep.net>
+Content-Description: Father William Part IV
+Content-Transfer-Encoding: base64
+
+YFlvdSBhcmUgb2xkLCcgc2FpZCB0aGUgeW91dGgsIGBvbmUgd291bGQgaGFyZGx5IHN1cHBvc2UK
+VGhhdCB5b3VyIGV5ZSB3YXMgYXMgc3RlYWR5IGFzIGV2ZXI7CllldCB5b3UgYmFsYW5jZWQgYW4g
+ZWVsIG9uIHRoZSBlbmQgb2YgeW91ciBub3NlLS0KV2hhdCBtYWRlIHlvdSBzbyBhd2Z1bGx5IGNs
+ZXZlcj8nCgpgSSBoYXZlIGFuc3dlcmVkIHRocmVlIHF1ZXN0aW9ucywgYW5kIHRoYXQgaXMgZW5v
+dWdoLCcKU2FpZCBoaXMgZmF0aGVyOyBgZG9uJ3QgZ2l2ZSB5b3Vyc2VsZiBhaXJzIQpEbyB5b3Ug
+dGhpbmsgSSBjYW4gbGlzdGVuIGFsbCBkYXkgdG8gc3VjaCBzdHVmZj8KQmUgb2ZmLCBvciBJJ2xs
+IGtpY2sgeW91IGRvd24gc3RhaXJzIScK
+
+------- =_aaaaaaaaaa2--
+
+------- =_aaaaaaaaaa1--
+
+------- =_aaaaaaaaaa0--
+
+To: Foo Bar <foobar@nonexistent.net>
+Subject: Empty MIME Parts
+Date: Sat, 13 Jul 2002 00:43:18 +0300
+From: Sergey Poznyakoff <gray@Mirddin.farlep.net>
+
+------- =_aaaaaaaaaa0
+Content-Type: text/plain; name="empty"; charset="us-ascii"
+Content-ID: <5082.1026510189.1@Mirddin.farlep.net>
+Content-Description: Empty part
+
+
+------- =_aaaaaaaaaa0
+Content-Type: text/plain; name="single.line"; charset="us-ascii"
+Content-ID: <5082.1026510189.2@Mirddin.farlep.net>
+Content-Description: Single line part
+
+
+
+------- =_aaaaaaaaaa0--
+
+
+])
diff --git a/readmsg/tests/atlocal.in b/readmsg/tests/atlocal.in
new file mode 100644
index 000000000..aa0ba444d
--- /dev/null
+++ b/readmsg/tests/atlocal.in
@@ -0,0 +1,7 @@
+# @configure_input@ -*- shell-script -*-
+# Configurable variable values for Mailutils test suite.
+# Copyright (C) 2004, 2010 Free Software Foundation, Inc.
+
+PATH=@abs_builddir@:@abs_top_builddir@/readmsg:$top_srcdir:$srcdir:$PATH
+top_srcdir=@abs_top_srcdir@
+top_builddir=@abs_top_builddir@
diff --git a/readmsg/tests/hdr.at b/readmsg/tests/hdr.at
new file mode 100644
index 000000000..ffbcff518
--- /dev/null
+++ b/readmsg/tests/hdr.at
@@ -0,0 +1,37 @@
+# This file is part of GNU Mailutils. -*- Autotest -*-
+# Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+#
+# GNU Mailutils is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of Mailfromd testsuite.
+
+READMSGTEST([readmsg -h],[hdr],
+[readmsg -h SOMETHING],
+[0],
+[From bar@dontmailme.org Fri Dec 28 23:28:09 2001
+Received: (from bar@dontmailme.org)
+ by dontmailme.org id fERKR9N16790
+ for foobar@nonexistent.net; Fri, 28 Dec 2001 22:18:08 +0200
+Date: Fri, 28 Dec 2001 23:28:08 +0200
+From: Bar <bar@dontmailme.org>
+To: Foo Bar <foobar@nonexistent.net>
+Message-Id: <200112232808.fERKR9N16790@dontmailme.org>
+Subject: Re: Jabberwocky
+
+It seems very pretty, but it's *rather* hard to understand!'
+Somehow it seems to fill my head with ideas -- only I don't
+exactly know what they are! However, SOMEBODY killed SOMETHING:
+that's clear, at any rate...
+
+
+]) \ No newline at end of file
diff --git a/readmsg/tests/nohdr.at b/readmsg/tests/nohdr.at
new file mode 100644
index 000000000..fb61e39a5
--- /dev/null
+++ b/readmsg/tests/nohdr.at
@@ -0,0 +1,27 @@
+# This file is part of GNU Mailutils. -*- Autotest -*-
+# Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+#
+# GNU Mailutils is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of Mailfromd testsuite.
+
+READMSGTEST([readmsg -n],[nohdr],
+[readmsg -n SOMETHING],
+[0],
+[It seems very pretty, but it's *rather* hard to understand!'
+Somehow it seems to fill my head with ideas -- only I don't
+exactly know what they are! However, SOMEBODY killed SOMETHING:
+that's clear, at any rate...
+
+
+])
diff --git a/readmsg/tests/testsuite.at b/readmsg/tests/testsuite.at
new file mode 100644
index 000000000..e7e63f0c6
--- /dev/null
+++ b/readmsg/tests/testsuite.at
@@ -0,0 +1,54 @@
+# This file is part of GNU Mailutils. -*- Autotest -*-
+# Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+#
+# GNU Mailutils is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of Mailfromd testsuite.
+
+# Require a reasonably recent autotest.
+m4_version_prereq([2.52g])
+m4_include([testsuite.inc])
+
+dnl ------------------------------------------------------------
+dnl READMSG_MAILBOX -- mailbox used for testing
+m4_define([READMSG_MAILBOX],[mbox1])
+
+dnl ------------------------------------------------------------
+dnl READMSG_OPTIONS -- default options for readmsg
+m4_define([READMSG_OPTIONS],[--no-site --no-user])
+
+dnl ------------------------------------------------------------
+dnl READMSGTEST(DESCR, KW, CMDLINE, [STATUS = `0'], [STDOUT = `'],
+dnl [STDERR = `'], [RUN-IF-FAIL], [RUN-IF-PASS])
+dnl
+m4_define([READMSGTEST],[
+AT_SETUP([$1])
+AT_KEYWORDS([$2])
+AT_CHECK([
+MAIL=$top_srcdir/testsuite/spool/READMSG_MAILBOX
+FOLDER=$MAIL
+export MAIL FOLDER
+readmsg READMSG_OPTIONS $3],
+m4_shift(m4_shift(m4_shift($@))))
+AT_CLEANUP])
+
+AT_INIT
+
+AT_TESTED([readmsg])
+
+MUT_VERSION(readmsg)
+m4_include([all.at])
+m4_include([twomsg.at])
+m4_include([hdr.at])
+m4_include([nohdr.at])
+m4_include([weed.at])
diff --git a/readmsg/tests/twomsg.at b/readmsg/tests/twomsg.at
new file mode 100644
index 000000000..a459927b0
--- /dev/null
+++ b/readmsg/tests/twomsg.at
@@ -0,0 +1,74 @@
+# This file is part of GNU Mailutils. -*- Autotest -*-
+# Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+#
+# GNU Mailutils is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of Mailfromd testsuite.
+
+READMSGTEST([readmsg 1 2],[twomsg],
+[1 2],
+[0],
+[Date: Fri, 28 Dec 2001 22:18:08 +0200
+From: Foo Bar <foobar@nonexistent.net>
+To: Bar <bar@dontmailme.org>
+Subject: Jabberwocky
+
+`Twas brillig, and the slithy toves
+Did gyre and gimble in the wabe;
+All mimsy were the borogoves,
+And the mome raths outgrabe.
+
+`Beware the Jabberwock, my son!
+The jaws that bite, the claws that catch!
+Beware the Jujub bird, and shun
+The frumious Bandersnatch!'
+
+He took his vorpal sword in hand:
+Long time the manxome foe he sought --
+So rested he by the Tumtum gree,
+And stood awhile in thought.
+
+And as in uffish thought he stood,
+The Jabberwock, with eyes of flame,
+Came whiffling through the tulgey wook,
+And burbled as it came!
+
+One, two! One, two! And through and through
+The vorpal blade went snicker-snack!
+He left it dead, and with its head
+He went galumphing back.
+
+`And has thou slain the Jabberwock?
+Come to my arms, my beamish boy!
+O frabjous day! Calloh! Callay!
+He chortled in his joy.
+
+`Twas brillig, and the slithy toves
+Did gyre and gimble in the wabe;
+All mimsy were the borogoves,
+And the mome raths outgrabe.
+
+
+Date: Fri, 28 Dec 2001 23:28:08 +0200
+From: Bar <bar@dontmailme.org>
+To: Foo Bar <foobar@nonexistent.net>
+Subject: Re: Jabberwocky
+
+It seems very pretty, but it's *rather* hard to understand!'
+Somehow it seems to fill my head with ideas -- only I don't
+exactly know what they are! However, SOMEBODY killed SOMETHING:
+that's clear, at any rate...
+
+
+])
+
diff --git a/readmsg/tests/weed.at b/readmsg/tests/weed.at
new file mode 100644
index 000000000..469cf1aa1
--- /dev/null
+++ b/readmsg/tests/weed.at
@@ -0,0 +1,30 @@
+# This file is part of GNU Mailutils. -*- Autotest -*-
+# Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+#
+# GNU Mailutils is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of Mailfromd testsuite.
+
+READMSGTEST([readmsg -w],[weed],
+[-w date,subject SOMETHING],
+[0],
+[Date: Fri, 28 Dec 2001 23:28:08 +0200
+Subject: Re: Jabberwocky
+
+It seems very pretty, but it's *rather* hard to understand!'
+Somehow it seems to fill my head with ideas -- only I don't
+exactly know what they are! However, SOMEBODY killed SOMETHING:
+that's clear, at any rate...
+
+
+]) \ No newline at end of file
diff --git a/readmsg/testsuite/.gitignore b/readmsg/testsuite/.gitignore
deleted file mode 100644
index 989f5903e..000000000
--- a/readmsg/testsuite/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-Makefile
-Makefile.in
-*.log
-*.sum
-site.exp
-remote.exp
-data
diff --git a/readmsg/testsuite/Makefile.am b/readmsg/testsuite/Makefile.am
deleted file mode 100644
index 56b7a017e..000000000
--- a/readmsg/testsuite/Makefile.am
+++ /dev/null
@@ -1,89 +0,0 @@
-## Process this file with GNU Automake to create Makefile.in
-
-## Copyright (C) 2002, 2007, 2010 Free Software Foundation, Inc.
-##
-## GNU Mailutils is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 3, or (at
-## your option) any later version.
-##
-## This program is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
-## 02110-1301 USA
-
-AUTOMAKE_OPTIONS = dejagnu
-DEJATOOL = readmsg
-RUNTESTFLAGS =
-CLEANFILES = *.log
-test_dirs = readmsg
-
-dist-hook:
- here=`cd $(top_builddir)/$(subdir) && pwd`; \
- srcdir=`cd $(srcdir) && pwd`; \
- distdir=`cd $(distdir) && pwd`; \
- for dir in $(test_dirs); \
- do \
- cd $$srcdir;\
- mkdir $$distdir/$$dir;\
- cd $$dir;\
- for file in DISTFILES `cat DISTFILES`; do \
- d=$$srcdir/$$dir; \
- if test -d $$d/$$file; then \
- cp -pr $$d/$$file $$distdir/$$dir/$$file; \
- else \
- test -f $$distdir/$$dir/$$file \
- || cp -p $$d/$$file $$distdir/$$dir/$$file || exit; \
- fi; \
- done;\
- done;\
- cd $$here
-
-site.exp: Makefile remote.exp
- @echo 'Making a new site.exp file...'
- @test ! -f site.bak || rm -f site.bak
- @echo '## these variables are automatically generated by make ##' > $@-t
- @echo '# Do not edit here. If you wish to override these values' >> $@-t
- @echo '# edit the last section' >> $@-t
- @echo 'set tool $(DEJATOOL)' >> $@-t
- @echo "set top_srcdir `cd $(top_srcdir); pwd`" >> $@-t
- @echo "set srcdir `cd $(srcdir); pwd`" >> $@-t
- @echo 'set objdir' `pwd` >> $@-t
- @echo 'set host_alias "$(host_alias)"' >> $@-t
- @echo 'set host_triplet $(host_triplet)' >> $@-t
- @echo 'set target_alias "$(target_alias)"' >> $@-t
- @echo 'set target_triplet $(target_triplet)' >> $@-t
- @echo 'set build_alias "$(build_alias)"' >> $@-t
- @echo 'set build_triplet $(build_triplet)' >> $@-t
- @echo '## All variables above are generated by configure. Do Not Edit ##' >> $@-t
- @test ! -f site.exp || sed '1,/^## All variables above are.*##/ d' site.exp >> $@-t
- @test ! -f site.exp || mv site.exp site.bak
- @mv $@-t site.exp
-
-remote.exp:;
- @echo 'Making a new remote.exp file...'
- @test ! -f remote.bak || rm -f remote.bak
- @echo '## These variables are used to set up for the remote testing.' >> $@-t
- @echo '## Please, read file README in this directory for instructions' >> $@-t
- @echo '## on how to use this file' >> $@-t
- @echo "set host_board `hostname`" >> $@-t
- @echo 'set board_info($$host_board,connect) rlogin' >> $@-t
- @echo 'set board_info($$host_board,shell_prompt) "\\$$ "' >> $@-t
- @echo "set board_info(\$$host_board,top_srcdir) `cd $(top_srcdir); pwd`" >> $@-t
- @echo "set board_info(\$$host_board,srcdir) `cd $(srcdir); pwd`" >> $@-t
- @echo "set board_info(\$$host_board,objdir) `pwd`" >> $@-t
- @echo "set board_info(\$$host_board,top_srcdir) `cd $(top_srcdir); pwd`" >> $@-t
- @echo "set board_info(\$$host_board,top_builddir) `cd $(top_builddir); pwd`" >> $@-t
- @test ! -f remote.exp || mv remote.exp remote.bak
- @mv $@-t remote.exp
-
-
-DISTCLEANFILES=*.exp *.log *.sum
-
-distclean-local:
- -rm -rf data
diff --git a/readmsg/testsuite/readmsg/DISTFILES b/readmsg/testsuite/readmsg/DISTFILES
deleted file mode 100644
index adf7c0985..000000000
--- a/readmsg/testsuite/readmsg/DISTFILES
+++ /dev/null
@@ -1 +0,0 @@
-test.exp
diff --git a/readmsg/testsuite/readmsg/test.exp b/readmsg/testsuite/readmsg/test.exp
deleted file mode 100644
index c789962f5..000000000
--- a/readmsg/testsuite/readmsg/test.exp
+++ /dev/null
@@ -1,309 +0,0 @@
-# -*- tcl -*-
-# This file is part of Mailutils testsuite.
-# Copyright (C) 2002, 2007, 2009, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301 USA.
-
-source $top_srcdir/testsuite/lib/mailutils.exp
-
-mu_init -noflags
-set env(MAIL) $MU_SPOOL_DIR/mbox1
-set env(FOLDER) $env(MAIL)
-
-mu_prepare_spools
-
-mu_exec -message "readmsg *" -arg "\\*" \
-"Date: Fri, 28 Dec 2001 22:18:08 +0200"\
-"From: Foo Bar <foobar@nonexistent.net>"\
-"To: Bar <bar@dontmailme.org>"\
-"Subject: Jabberwocky"\
-""\
-"`Twas brillig, and the slithy toves"\
-"Did gyre and gimble in the wabe;"\
-"All mimsy were the borogoves,"\
-"And the mome raths outgrabe."\
-""\
-"`Beware the Jabberwock, my son!"\
-"The jaws that bite, the claws that catch!"\
-"Beware the Jujub bird, and shun"\
-"The frumious Bandersnatch!'"\
-""\
-"He took his vorpal sword in hand:"\
-"Long time the manxome foe he sought --"\
-"So rested he by the Tumtum gree,"\
-"And stood awhile in thought."\
-""\
-"And as in uffish thought he stood,"\
-"The Jabberwock, with eyes of flame,"\
-"Came whiffling through the tulgey wook,"\
-"And burbled as it came!"\
-""\
-"One, two! One, two! And through and through"\
-"The vorpal blade went snicker-snack!"\
-"He left it dead, and with its head"\
-"He went galumphing back."\
-""\
-"`And has thou slain the Jabberwock?"\
-"Come to my arms, my beamish boy!"\
-"O frabjous day! Calloh! Callay!"\
-"He chortled in his joy."\
-""\
-"`Twas brillig, and the slithy toves"\
-"Did gyre and gimble in the wabe;"\
-"All mimsy were the borogoves,"\
-"And the mome raths outgrabe."\
-""\
-""\
-"Date: Fri, 28 Dec 2001 23:28:08 +0200"\
-"From: Bar <bar@dontmailme.org>"\
-"To: Foo Bar <foobar@nonexistent.net>"\
-"Subject: Re: Jabberwocky"\
-""\
-"It seems very pretty, but it's *rather* hard to understand!'"\
-"Somehow it seems to fill my head with ideas -- only I don't"\
-"exactly know what they are! However, SOMEBODY killed SOMETHING:"\
-"that's clear, at any rate..."\
-""\
-"To: Foo Bar <foobar@nonexistent.net>"\
-"Subject: Simple MIME"\
-"Date: Sat, 13 Jul 2002 00:43:18 +0300"\
-"From: Sergey Poznyakoff <gray@Mirddin.farlep.net>"\
-""\
--- "------- =_aaaaaaaaaa0"\
-"Content-Type: text/plain; name=\"msg.1\"; charset=\"us-ascii\""\
-"Content-ID: <5082.1026510189.1@Mirddin.farlep.net>"\
-"Content-Description: How doth"\
-""\
-"How doth the little crocodile"\
-"Improve his shining tail,"\
-"And pour the waters of the Nile"\
-"On every golden scale!"\
-""\
-"`How cheerfully he seems to grin,"\
-"How neatly spread his claws,"\
-"And welcome little fishes in"\
-"With gently smiling jaws!"\
-""\
--- "------- =_aaaaaaaaaa0"\
-"Content-Type: application/octet-stream; name=\"msg.21\""\
-"Content-ID: <5082.1026510189.2@Mirddin.farlep.net>"\
-"Content-Description: Father William Part I"\
-"Content-Transfer-Encoding: base64"\
-""\
-"YFlvdSBhcmUgb2xkLCBGYXRoZXIgV2lsbGlhbSwnIHRoZSB5b3VuZyBtYW4gc2FpZCwKYEFuZCB5"\
-"b3VyIGhhaXIgaGFzIGJlY29tZSB2ZXJ5IHdoaXRlOwpBbmQgeWV0IHlvdSBpbmNlc3NhbnRseSBz"\
-"dGFuZCBvbiB5b3VyIGhlYWQtLQpEbyB5b3UgdGhpbmssIGF0IHlvdXIgYWdlLCBpdCBpcyByaWdo"\
-"dD8nCgpgSW4gbXkgeW91dGgsJyBGYXRoZXIgV2lsbGlhbSByZXBsaWVkIHRvIGhpcyBzb24sCmBJ"\
-"IGZlYXJlZCBpdCBtaWdodCBpbmp1cmUgdGhlIGJyYWluOwpCdXQsIG5vdyB0aGF0IEknbSBwZXJm"\
-"ZWN0bHkgc3VyZSBJIGhhdmUgbm9uZSwKV2h5LCBJIGRvIGl0IGFnYWluIGFuZCBhZ2Fpbi4nCgo="\
-""\
--- "------- =_aaaaaaaaaa0--"\
-""\
-"To: Foo Bar <foobar@nonexistent.net>"\
-"Subject: Nested MIME"\
-"Date: Sat, 13 Jul 2002 00:50:58 +0300"\
-"From: Sergey Poznyakoff <gray@Mirddin.farlep.net>"\
-""\
--- "------- =_aaaaaaaaaa0"\
-"Content-Type: text/plain; name=\"msg.21\"; charset=\"us-ascii\""\
-"Content-ID: <5122.1026510654.2@Mirddin.farlep.net>"\
-"Content-Description: Father William Part I"\
-""\
-"`You are old, Father William,' the young man said,"\
-"`And your hair has become very white;"\
-"And yet you incessantly stand on your head--"\
-"Do you think, at your age, it is right?'"\
-""\
-"`In my youth,' Father William replied to his son,"\
-"`I feared it might injure the brain;"\
-"But, now that I'm perfectly sure I have none,"\
-"Why, I do it again and again.'"\
-""\
-""\
--- "------- =_aaaaaaaaaa0"\
-"Content-Type: multipart/mixed; boundary=\"----- =_aaaaaaaaaa1\""\
-"Content-ID: <5122.1026510654.3@Mirddin.farlep.net>"\
-""\
--- "------- =_aaaaaaaaaa1"\
-"Content-Type: application/octet-stream; name=\"msg.22\""\
-"Content-ID: <5122.1026510654.4@Mirddin.farlep.net>"\
-"Content-Description: Father William Part II"\
-"Content-Transfer-Encoding: base64"\
-""\
-"YFlvdSBhcmUgb2xkLCcgc2FpZCB0aGUgeW91dGgsIGBhcyBJIG1lbnRpb25lZCBiZWZvcmUsCkFu"\
-"ZCBoYXZlIGdyb3duIG1vc3QgdW5jb21tb25seSBmYXQ7CllldCB5b3UgdHVybmVkIGEgYmFjay1z"\
-"b21lcnNhdWx0IGluIGF0IHRoZSBkb29yLS0KUHJheSwgd2hhdCBpcyB0aGUgcmVhc29uIG9mIHRo"\
-"YXQ/JwoKYEluIG15IHlvdXRoLCcgc2FpZCB0aGUgc2FnZSwgYXMgaGUgc2hvb2sgaGlzIGdyZXkg"\
-"bG9ja3MsCmBJIGtlcHQgYWxsIG15IGxpbWJzIHZlcnkgc3VwcGxlCkJ5IHRoZSB1c2Ugb2YgdGhp"\
-"cyBvaW50bWVudC0tb25lIHNoaWxsaW5nIHRoZSBib3gtLQpBbGxvdyBtZSB0byBzZWxsIHlvdSBh"\
-"IGNvdXBsZT8nCg=="\
-""\
--- "------- =_aaaaaaaaaa1"\
-"Content-Type: multipart/mixed; boundary=\"----- =_aaaaaaaaaa2\""\
-"Content-ID: <5122.1026510654.5@Mirddin.farlep.net>"\
-""\
--- "------- =_aaaaaaaaaa2"\
-"Content-Type: application/octet-stream; name=\"msg.23\""\
-"Content-ID: <5122.1026510654.6@Mirddin.farlep.net>"\
-"Content-Description: Father William Part III"\
-"Content-Transfer-Encoding: base64"\
-""\
-"YFlvdSBhcmUgb2xkLCcgc2FpZCB0aGUgeW91dGgsIGBhbmQgeW91ciBqYXdzIGFyZSB0b28gd2Vh"\
-"awpGb3IgYW55dGhpbmcgdG91Z2hlciB0aGFuIHN1ZXQ7CllldCB5b3UgZmluaXNoZWQgdGhlIGdv"\
-"b3NlLCB3aXRoIHRoZSBib25lcyBhbmQgdGhlIGJlYWstLQpQcmF5IGhvdyBkaWQgeW91IG1hbmFn"\
-"ZSB0byBkbyBpdD8nCgpgSW4gbXkgeW91dGgsJyBzYWlkIGhpcyBmYXRoZXIsIGBJIHRvb2sgdG8g"\
-"dGhlIGxhdywKQW5kIGFyZ3VlZCBlYWNoIGNhc2Ugd2l0aCBteSB3aWZlOwpBbmQgdGhlIG11c2N1"\
-"bGFyIHN0cmVuZ3RoLCB3aGljaCBpdCBnYXZlIHRvIG15IGphdywKSGFzIGxhc3RlZCB0aGUgcmVz"\
-"dCBvZiBteSBsaWZlLicK"\
-""\
--- "------- =_aaaaaaaaaa2"\
-"Content-Type: application/octet-stream; name=\"msg.24\""\
-"Content-ID: <5122.1026510654.7@Mirddin.farlep.net>"\
-"Content-Description: Father William Part IV"\
-"Content-Transfer-Encoding: base64"\
-""\
-"YFlvdSBhcmUgb2xkLCcgc2FpZCB0aGUgeW91dGgsIGBvbmUgd291bGQgaGFyZGx5IHN1cHBvc2UK"\
-"VGhhdCB5b3VyIGV5ZSB3YXMgYXMgc3RlYWR5IGFzIGV2ZXI7CllldCB5b3UgYmFsYW5jZWQgYW4g"\
-"ZWVsIG9uIHRoZSBlbmQgb2YgeW91ciBub3NlLS0KV2hhdCBtYWRlIHlvdSBzbyBhd2Z1bGx5IGNs"\
-"ZXZlcj8nCgpgSSBoYXZlIGFuc3dlcmVkIHRocmVlIHF1ZXN0aW9ucywgYW5kIHRoYXQgaXMgZW5v"\
-"dWdoLCcKU2FpZCBoaXMgZmF0aGVyOyBgZG9uJ3QgZ2l2ZSB5b3Vyc2VsZiBhaXJzIQpEbyB5b3Ug"\
-"dGhpbmsgSSBjYW4gbGlzdGVuIGFsbCBkYXkgdG8gc3VjaCBzdHVmZj8KQmUgb2ZmLCBvciBJJ2xs"\
-"IGtpY2sgeW91IGRvd24gc3RhaXJzIScK"\
-""\
--- "------- =_aaaaaaaaaa2--"\
-""\
--- "------- =_aaaaaaaaaa1--"\
-""\
--- "------- =_aaaaaaaaaa0--"\
-""\
-"To: Foo Bar <foobar@nonexistent.net>"\
-"Subject: Empty MIME Parts"\
-"Date: Sat, 13 Jul 2002 00:43:18 +0300"\
-"From: Sergey Poznyakoff <gray@Mirddin.farlep.net>"\
-""\
--- "------- =_aaaaaaaaaa0"\
-"Content-Type: text/plain; name=\"empty\"; charset=\"us-ascii\""\
-"Content-ID: <5082.1026510189.1@Mirddin.farlep.net>"\
-"Content-Description: Empty part"\
-""\
-""\
--- "------- =_aaaaaaaaaa0"\
-"Content-Type: text/plain; name=\"single.line\"; charset=\"us-ascii\""\
-"Content-ID: <5082.1026510189.2@Mirddin.farlep.net>"\
-"Content-Description: Single line part"\
-""\
-""\
-""\
--- "------- =_aaaaaaaaaa0--"\
-""\
-""
-
-
-mu_exec -message "readmsg 1 2" -arg 1 -arg 2 \
-"Date: Fri, 28 Dec 2001 22:18:08 +0200"\
-"From: Foo Bar <foobar@nonexistent.net>"\
-"To: Bar <bar@dontmailme.org>"\
-"Subject: Jabberwocky"\
-""\
-"`Twas brillig, and the slithy toves"\
-"Did gyre and gimble in the wabe;"\
-"All mimsy were the borogoves,"\
-"And the mome raths outgrabe."\
-""\
-"`Beware the Jabberwock, my son!"\
-"The jaws that bite, the claws that catch!"\
-"Beware the Jujub bird, and shun"\
-"The frumious Bandersnatch!'"\
-""\
-"He took his vorpal sword in hand:"\
-"Long time the manxome foe he sought --"\
-"So rested he by the Tumtum gree,"\
-"And stood awhile in thought."\
-""\
-"And as in uffish thought he stood,"\
-"The Jabberwock, with eyes of flame,"\
-"Came whiffling through the tulgey wook,"\
-"And burbled as it came!"\
-""\
-"One, two! One, two! And through and through"\
-"The vorpal blade went snicker-snack!"\
-"He left it dead, and with its head"\
-"He went galumphing back."\
-""\
-"`And has thou slain the Jabberwock?"\
-"Come to my arms, my beamish boy!"\
-"O frabjous day! Calloh! Callay!"\
-"He chortled in his joy."\
-""\
-"`Twas brillig, and the slithy toves"\
-"Did gyre and gimble in the wabe;"\
-"All mimsy were the borogoves,"\
-"And the mome raths outgrabe."\
-""\
-""\
-"Date: Fri, 28 Dec 2001 23:28:08 +0200"\
-"From: Bar <bar@dontmailme.org>"\
-"To: Foo Bar <foobar@nonexistent.net>"\
-"Subject: Re: Jabberwocky"\
-""\
-"It seems very pretty, but it's *rather* hard to understand!'"\
-"Somehow it seems to fill my head with ideas -- only I don't"\
-"exactly know what they are! However, SOMEBODY killed SOMETHING:"\
-"that's clear, at any rate..."\
-""\
-""
-
-mu_exec -message "readmsg -h SOMETHING" -arg -h -arg SOMETHING \
-"From bar@dontmailme.org Fri Dec 28 23:28:09 2001"\
-"Received: (from bar@dontmailme.org) "\
-" by dontmailme.org id fERKR9N16790"\
-" for foobar@nonexistent.net; Fri, 28 Dec 2001 22:18:08 +0200"\
-"Date: Fri, 28 Dec 2001 23:28:08 +0200"\
-"From: Bar <bar@dontmailme.org>"\
-"To: Foo Bar <foobar@nonexistent.net>"\
-"Message-Id: <200112232808.fERKR9N16790@dontmailme.org>"\
-"Subject: Re: Jabberwocky"\
-""\
-"It seems very pretty, but it's *rather* hard to understand!'"\
-"Somehow it seems to fill my head with ideas -- only I don't"\
-"exactly know what they are! However, SOMEBODY killed SOMETHING:"\
-"that's clear, at any rate..."\
-""\
-""
-
-mu_exec -message "readmsg -n SOMETHING" -arg -n -arg SOMETHING \
-"It seems very pretty, but it's *rather* hard to understand!'"\
-"Somehow it seems to fill my head with ideas -- only I don't"\
-"exactly know what they are! However, SOMEBODY killed SOMETHING:"\
-"that's clear, at any rate..."\
-""\
-""
-
-mu_exec -message "readmsg -w date,subject SOMETHING" -arg "-w date,subject" \
- -arg SOMETHING \
-"Date: Fri, 28 Dec 2001 23:28:08 +0200"\
-"Subject: Re: Jabberwocky"\
-""\
-"It seems very pretty, but it's *rather* hard to understand!'"\
-"Somehow it seems to fill my head with ideas -- only I don't"\
-"exactly know what they are! However, SOMEBODY killed SOMETHING:"\
-"that's clear, at any rate..."\
-""\
-""
-
-#end of test.exp
-
-
diff --git a/sieve/tests/testsuite.at b/sieve/tests/testsuite.at
index 507026991..c6d7b82b1 100644
--- a/sieve/tests/testsuite.at
+++ b/sieve/tests/testsuite.at
@@ -18,8 +18,6 @@
# Require a reasonably recent autotest.
m4_version_prereq([2.52g])
-m4_define([AT_SKIP_TEST],[exit 77])
-
dnl ------------------------------------------------------------
dnl testcompile(SCRIPT) -- test compilation of the Sieve SCRIPT
dnl
diff --git a/sieve/tests/version.at b/sieve/tests/version.at
index 8559e9aa7..5b8fc3675 100644
--- a/sieve/tests/version.at
+++ b/sieve/tests/version.at
@@ -17,4 +17,4 @@
m4_include([testsuite.inc])
-MUT_VERSION(frm)
+MUT_VERSION(sieve)
diff --git a/testsuite/spool/mbox1 b/testsuite/spool/mbox1
index bc1de8d5e..dee5a975d 100644
--- a/testsuite/spool/mbox1
+++ b/testsuite/spool/mbox1
@@ -1,5 +1,5 @@
From foobar@nonexistent.net Fri Dec 28 22:18:09 2001
-Received: (from foobar@nonexistent.net)
+Received: (from foobar@nonexistent.net)
by nonexistent.net id fBSKI8N04906
for bar@dontmailme.org; Fri, 28 Dec 2001 22:18:08 +0200
Date: Fri, 28 Dec 2001 22:18:08 +0200
@@ -45,7 +45,7 @@ And the mome raths outgrabe.
From bar@dontmailme.org Fri Dec 28 23:28:09 2001
-Received: (from bar@dontmailme.org)
+Received: (from bar@dontmailme.org)
by dontmailme.org id fERKR9N16790
for foobar@nonexistent.net; Fri, 28 Dec 2001 22:18:08 +0200
Date: Fri, 28 Dec 2001 23:28:08 +0200
@@ -61,7 +61,7 @@ that's clear, at any rate...
From gray@Mirddin.farlep.net Sat Jul 13 00:43:18 2002
Organization: Mailutils-tests
-Received: from Mirddin.farlep.net (localhost [127.0.0.1])
+Received: from Mirddin.farlep.net (localhost [127.0.0.1])
by Mirddin.farlep.net with ESMTP id g6CLhIb05086
for <gray@mirddin.farlep.net>; Sat, 13 Jul 2002 00:43:18 +0300
Message-Id: <200207122143.g6CLhIb05086@Mirddin.farlep.net>
@@ -105,7 +105,7 @@ ZWN0bHkgc3VyZSBJIGhhdmUgbm9uZSwKV2h5LCBJIGRvIGl0IGFnYWluIGFuZCBhZ2Fpbi4nCgo=
From gray@Mirddin.farlep.net Sat Jul 13 00:50:58 2002
Organization: Mailutils-tests
-Received: from Mirddin.farlep.net (localhost [127.0.0.1])
+Received: from Mirddin.farlep.net (localhost [127.0.0.1])
by Mirddin.farlep.net with ESMTP id g6CLowb05126
for <gray@mirddin.farlep.net>; Sat, 13 Jul 2002 00:50:58 +0300
Message-Id: <200207122150.g6CLowb05126@Mirddin.farlep.net>
@@ -191,7 +191,7 @@ IGtpY2sgeW91IGRvd24gc3RhaXJzIScK
From gray@Mirddin.farlep.net Sat Jul 13 00:43:18 2002
Organization: Mailutils-tests
-Received: from Mirddin.farlep.net (localhost [127.0.0.1])
+Received: from Mirddin.farlep.net (localhost [127.0.0.1])
by Mirddin.farlep.net with ESMTP id g6CLhIb05086
for <gray@mirddin.farlep.net>; Sat, 13 Jul 2002 00:43:18 +0300
Message-Id: <200207122143.g6CLhIb05086@Mirddin.farlep.net>
diff --git a/testsuite/testsuite.inc b/testsuite/testsuite.inc
index e5273256b..8d5b6101f 100644
--- a/testsuite/testsuite.inc
+++ b/testsuite/testsuite.inc
@@ -26,7 +26,7 @@ AT_CHECK([$1 --version | sed '1{s/ *[\[.*\]]//;q}' ],
[$1 (AT_PACKAGE_NAME) AT_PACKAGE_VERSION
],
[],
-[cat >$[]XFAILFILE <<'_EOT'
+[cat >.xfailfile <<'_EOT'
==============================================================
WARNING: Not using the proper version, *all* checks dubious...
@@ -36,4 +36,7 @@ _EOT
[rm -f $[]XFAILFILE])
AT_CLEANUP
-]) \ No newline at end of file
+])
+
+m4_define([AT_SKIP_TEST],[exit 77])
+

Return to:

Send suggestions and report system problems to the System administrator.