[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Mailutils branch, master, updated. release-2.2-73-gd1d548e
|
From: |
Sergey Poznyakoff |
|
Subject: |
[SCM] GNU Mailutils branch, master, updated. release-2.2-73-gd1d548e |
|
Date: |
Tue, 14 Sep 2010 09:26:55 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".
http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=d1d548e1473e5e87e42df174110d57a05b9402d1
The branch, master has been updated
via d1d548e1473e5e87e42df174110d57a05b9402d1 (commit)
via 41286c83435775028014014e9f7f6414190b4045 (commit)
from c68f3eea67bf9206971b8b0a22cca45c24eb3dc0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d1d548e1473e5e87e42df174110d57a05b9402d1
Author: Sergey Poznyakoff <address@hidden>
Date: Tue Sep 14 12:01:29 2010 +0300
Rewrite readmsg testsuite in Autotest.
* configure.ac: Add readmsg/tests/
* readmsg/Makefile.am: New file.
* readmsg/tests/.gitignore: New file.
* readmsg/tests/Makefile.am: New file.
* readmsg/tests/all.at: New file.
* readmsg/tests/atlocal.in: New file.
* readmsg/tests/hdr.at: New file.
* readmsg/tests/nohdr.at: New file.
* readmsg/tests/testsuite.at: New file.
* readmsg/tests/twomsg.at: New file.
* readmsg/tests/weed.at: New file.
* readmsg/testsuite: Remove.
* testsuite/testsuite.inc (AT_SKIP_TEST): New macro.
* testsuite/spool/mbox1: Remove trailing whitespace after Received headers.
* imap4d/testsuite/imap4d/fetch.exp: Reflece changes in mbox1.
* mail/testsuite/mail/read.exp: Likewise.
* mail/testsuite/mail/write.exp: Likewise.
* mailbox/testsuite/Mime: Likewise.
commit 41286c83435775028014014e9f7f6414190b4045
Author: Sergey Poznyakoff <address@hidden>
Date: Tue Sep 14 11:11:24 2010 +0300
Rewrite frm testsuite in Autotest.
* configure.ac: Build frm/testsuite/Makefile.am and atlocal.
Remove frm/testsuite/Makefile.
* testsuite/testsuite.inc: New file.
* frm/testsuite: Remove DejaGNU-based testsuite.
* frm/tests: Autotest-based testsuite.
* frm/tests/.gitignore
* frm/tests/Makefile.am
* frm/tests/atlocal.in
* frm/tests/testsuite.at
* frm/Makefile.am (SUBDIRS): Replace testsuite with tests.
* sieve/tests/Makefile.am (TESTSUITE): Add an include option.
* sieve/tests/version.at: Use macro from testsuite.inc.
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 9 +-
frm/Makefile.am | 2 +-
{sieve => frm}/tests/.gitignore | 0
{sieve => frm}/tests/Makefile.am | 27 +--
{sieve => frm}/tests/atlocal.in | 2 +-
frm/tests/testsuite.at | 115 ++++++++
frm/testsuite/.gitignore | 7 -
frm/testsuite/Makefile.am | 89 ------
frm/testsuite/frm/DISTFILES | 1 -
frm/testsuite/frm/test.exp | 65 -----
imap4d/testsuite/imap4d/fetch.exp | 36 ++--
mail/testsuite/mail/read.exp | 50 ++--
mail/testsuite/mail/write.exp | 20 +-
mailbox/testsuite/Mime | 14 +-
readmsg/Makefile.am | 2 +-
{sieve => readmsg}/tests/.gitignore | 0
{sieve => readmsg}/tests/Makefile.am | 27 +--
testsuite/spool/mbox1 => readmsg/tests/all.at | 62 ++---
{sieve => readmsg}/tests/atlocal.in | 9 +-
sieve/tests/ext.at => readmsg/tests/hdr.at | 45 ++--
sieve/tests/envelope.at => readmsg/tests/nohdr.at | 18 +-
readmsg/tests/testsuite.at | 54 ++++
readmsg/tests/twomsg.at | 74 +++++
sieve/tests/envelope.at => readmsg/tests/weed.at | 21 +-
readmsg/testsuite/.gitignore | 7 -
readmsg/testsuite/Makefile.am | 89 ------
readmsg/testsuite/readmsg/DISTFILES | 1 -
readmsg/testsuite/readmsg/test.exp | 309 ---------------------
sieve/tests/Makefile.am | 2 +-
sieve/tests/testsuite.at | 2 -
sieve/tests/version.at | 18 +-
testsuite/spool/mbox1 | 10 +-
sieve/tests/version.at => testsuite/testsuite.inc | 16 +-
33 files changed, 400 insertions(+), 803 deletions(-)
copy {sieve => frm}/tests/.gitignore (100%)
copy {sieve => frm}/tests/Makefile.am (83%)
copy {sieve => frm}/tests/atlocal.in (84%)
create mode 100644 frm/tests/testsuite.at
delete mode 100644 frm/testsuite/.gitignore
delete mode 100644 frm/testsuite/Makefile.am
delete mode 100644 frm/testsuite/frm/DISTFILES
delete mode 100644 frm/testsuite/frm/test.exp
copy {sieve => readmsg}/tests/.gitignore (100%)
copy {sieve => readmsg}/tests/Makefile.am (84%)
copy testsuite/spool/mbox1 => readmsg/tests/all.at (76%)
copy {sieve => readmsg}/tests/atlocal.in (55%)
copy sieve/tests/ext.at => readmsg/tests/hdr.at (55%)
copy sieve/tests/envelope.at => readmsg/tests/nohdr.at (74%)
create mode 100644 readmsg/tests/testsuite.at
create mode 100644 readmsg/tests/twomsg.at
copy sieve/tests/envelope.at => readmsg/tests/weed.at (69%)
delete mode 100644 readmsg/testsuite/.gitignore
delete mode 100644 readmsg/testsuite/Makefile.am
delete mode 100644 readmsg/testsuite/readmsg/DISTFILES
delete mode 100644 readmsg/testsuite/readmsg/test.exp
copy sieve/tests/version.at => testsuite/testsuite.inc (74%)
diff --git a/configure.ac b/configure.ac
index 8d1919a..c7babe7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1211,7 +1211,12 @@ AC_ARG_WITH([mh-bindir],
# Initialize the (autotest) test suite.
AC_CONFIG_TESTDIR(tests)
-AC_CONFIG_FILES([sieve/tests/Makefile sieve/tests/atlocal])
+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])
dnl Make sysconfdir available to the application
@@ -1329,7 +1334,6 @@ AC_CONFIG_FILES([
examples/scheme/Makefile
gint/Makefile
frm/Makefile
- frm/testsuite/Makefile
guimb/Makefile
guimb/scm/Makefile
imap4d/Makefile
@@ -1371,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/Makefile.am b/frm/Makefile.am
index 8965eb7..f4b86fa 100644
--- a/frm/Makefile.am
+++ b/frm/Makefile.am
@@ -20,7 +20,7 @@
INCLUDES = @MU_APP_COMMON_INCLUDES@
-SUBDIRS = testsuite
+SUBDIRS = tests
bin_PROGRAMS = frm from
frm_SOURCES = frm.c common.c frm.h
diff --git a/sieve/tests/.gitignore b/frm/tests/.gitignore
similarity index 100%
copy from sieve/tests/.gitignore
copy to frm/tests/.gitignore
diff --git a/sieve/tests/Makefile.am b/frm/tests/Makefile.am
similarity index 83%
copy from sieve/tests/Makefile.am
copy to frm/tests/Makefile.am
index 191585d..647d108 100644
--- a/sieve/tests/Makefile.am
+++ b/frm/tests/Makefile.am
@@ -17,7 +17,6 @@
EXTRA_DIST = $(TESTSUITE_AT) testsuite package.m4
DISTCLEANFILES = atconfig $(check_SCRIPTS)
MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
-#SUBDIRS = etc
## ------------ ##
## package.m4. ##
@@ -39,36 +38,14 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
## Test suite. ##
## ------------ ##
-TESTSUITE_AT = \
- action.at\
- address.at\
- allof.at\
- anyof.at\
- compile.at\
- envelope.at\
- exists.at\
- ext.at\
- false.at\
- header.at\
- i-casemap.at\
- i-numeric.at\
- i-octet.at\
- mul-addr.at\
- not.at\
- redirect.at\
- reject.at\
- relational.at\
- size.at\
- true.at\
- testsuite.at\
- version.at
+TESTSUITE_AT = testsuite.at
TESTSUITE = $(srcdir)/testsuite
M4=m4
AUTOTEST = $(AUTOM4TE) --language=autotest
$(TESTSUITE): package.m4 $(TESTSUITE_AT)
- $(AM_V_GEN)$(AUTOTEST) -I $(srcdir) testsuite.at -o address@hidden
+ $(AM_V_GEN)$(AUTOTEST) -I $(srcdir) -I $(top_srcdir)/testsuite
testsuite.at -o address@hidden
$(AM_V_at)mv address@hidden $@
atconfig: $(top_builddir)/config.status
diff --git a/sieve/tests/atlocal.in b/frm/tests/atlocal.in
similarity index 84%
copy from sieve/tests/atlocal.in
copy to frm/tests/atlocal.in
index 19343df..c334d2a 100644
--- a/sieve/tests/atlocal.in
+++ b/frm/tests/atlocal.in
@@ -2,7 +2,7 @@
# Configurable variable values for Mailutils test suite.
# Copyright (C) 2004, 2010 Free Software Foundation, Inc.
address@hidden@:@abs_top_builddir@/sieve:$top_srcdir:$srcdir:$PATH
address@hidden@:@abs_top_builddir@/frm:$top_srcdir:$srcdir:$PATH
address@hidden@
address@hidden@
diff --git a/frm/tests/testsuite.at b/frm/tests/testsuite.at
new file mode 100644
index 0000000..eae8fc1
--- /dev/null
+++ b/frm/tests/testsuite.at
@@ -0,0 +1,115 @@
+# 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_define([AT_SKIP_TEST],[exit 77])
+
+dnl ------------------------------------------------------------
+dnl FRM_MAILBOX -- mailbox used for testing
+m4_define([FRM_MAILBOX],[mbox1])
+
+dnl ------------------------------------------------------------
+dnl FRM_OPTIONS -- default options for frm
+m4_define([FRM_OPTIONS],[--no-site --no-user])
+
+dnl ------------------------------------------------------------
+dnl FRMTEST(DESCR, KW, CMDLINE, [STATUS = `0'], [STDOUT = `'],
+dnl [STDERR = `'], [RUN-IF-FAIL], [RUN-IF-PASS])
+dnl
+m4_define([FRMTEST],[
+AT_SETUP([$1])
+AT_KEYWORDS([$2])
+AT_CHECK([
+MAIL=$top_srcdir/testsuite/spool/FRM_MAILBOX
+FOLDER=$MAIL
+export MAIL FOLDER
+frm FRM_OPTIONS $3],
+m4_shift(m4_shift(m4_shift($@))))
+AT_CLEANUP])
+
+AT_INIT
+
+AT_TESTED([frm])
+
+m4_include([testsuite.inc])
+
+MUT_VERSION(frm)
+
+FRMTEST([no options],[frm00],
+[],
+[1],
+[Foo Bar Jabberwocky
+Bar Re: Jabberwocky
+Sergey Poznyakoff Simple MIME
+Sergey Poznyakoff Nested MIME
+Sergey Poznyakoff Empty MIME Parts
+])
+
+FRMTEST([frm -n],[frm-n frm01],
+[-n],
+[1],
+[ 1: Foo Bar Jabberwocky
+ 2: Bar Re: Jabberwocky
+ 3: Sergey Poznyakoff Simple MIME
+ 4: Sergey Poznyakoff Nested MIME
+ 5: Sergey Poznyakoff Empty MIME Parts
+])
+
+FRMTEST([frm -l],[frm-l frm02],
+[-l],
+[1],
+[(Bar) Foo Bar Jabberwocky
+(Foo Bar) Bar Re: Jabberwocky
+(Foo Bar) Sergey Poznyakoff Simple MIME
+(Foo Bar) Sergey Poznyakoff Nested MIME
+(Foo Bar) Sergey Poznyakoff Empty MIME Parts
+])
+
+FRMTEST([frm -qS],[frm-qS frm03],
+[-qS],
+[1],
+[Folder contains 5 new messages.
+])
+
+FRMTEST([frm -q],[frm-q frm04],
+[-q],
+[1],
+[There are messages in that folder.
+])
+
+FRMTEST([frm +mbox],[frm+mbox frm05],
+[--set ":mailbox:folder=$top_srcdir/testsuite/spool" +mbox],
+[1],
+[Sergey Poznyakoff MBOX
+])
+
+FRMTEST([nonexistent mailbox],[frm06],
+[-q %nonexistent],
+[2],
+[No messages in that folder!
+])
+
+m4_pushdef([FRM_MAILBOX],[bigto.mbox])
+FRMTEST([frm -l on long headers],[frm07],
+[-l],
+[1],
+[(Ayoung-Chee, Nigel Paul -- Nigel Paul Ayoung-Chee) Patrick Chan New
email address, etc.
+])
+m4_popdef([FRM_MAILBOX])
+
diff --git a/frm/testsuite/.gitignore b/frm/testsuite/.gitignore
deleted file mode 100644
index 989f590..0000000
--- a/frm/testsuite/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-Makefile
-Makefile.in
-*.log
-*.sum
-site.exp
-remote.exp
-data
diff --git a/frm/testsuite/Makefile.am b/frm/testsuite/Makefile.am
deleted file mode 100644
index 49704f9..0000000
--- a/frm/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 = frm
-RUNTESTFLAGS =
-CLEANFILES = *.log
-test_dirs = frm
-
-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 ##' >
address@hidden
- @echo '# Do not edit here. If you wish to override these values' >>
address@hidden
- @echo '# edit the last section' >> address@hidden
- @echo 'set tool $(DEJATOOL)' >> address@hidden
- @echo "set top_srcdir `cd $(top_srcdir); pwd`" >> address@hidden
- @echo "set srcdir `cd $(srcdir); pwd`" >> address@hidden
- @echo 'set objdir' `pwd` >> address@hidden
- @echo 'set host_alias "$(host_alias)"' >> address@hidden
- @echo 'set host_triplet $(host_triplet)' >> address@hidden
- @echo 'set target_alias "$(target_alias)"' >> address@hidden
- @echo 'set target_triplet $(target_triplet)' >> address@hidden
- @echo 'set build_alias "$(build_alias)"' >> address@hidden
- @echo 'set build_triplet $(build_triplet)' >> address@hidden
- @echo '## All variables above are generated by configure. Do Not Edit
##' >> address@hidden
- @test ! -f site.exp || sed '1,/^## All variables above are.*##/ d'
site.exp >> address@hidden
- @test ! -f site.exp || mv site.exp site.bak
- @mv address@hidden 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.'
>> address@hidden
- @echo '## Please, read file README in this directory for instructions'
>> address@hidden
- @echo '## on how to use this file' >> address@hidden
- @echo "set host_board `hostname`" >> address@hidden
- @echo 'set board_info($$host_board,connect) rlogin' >> address@hidden
- @echo 'set board_info($$host_board,shell_prompt) "\\$$ "' >>
address@hidden
- @echo "set board_info(\$$host_board,top_srcdir) `cd $(top_srcdir);
pwd`" >> address@hidden
- @echo "set board_info(\$$host_board,srcdir) `cd $(srcdir); pwd`" >>
address@hidden
- @echo "set board_info(\$$host_board,objdir) `pwd`" >> address@hidden
- @echo "set board_info(\$$host_board,top_srcdir) `cd $(top_srcdir);
pwd`" >> address@hidden
- @echo "set board_info(\$$host_board,top_builddir) `cd $(top_builddir);
pwd`" >> address@hidden
- @test ! -f remote.exp || mv remote.exp remote.bak
- @mv address@hidden remote.exp
-
-
-DISTCLEANFILES=*.exp *.log *.sum
-
-distclean-local:
- -rm -rf data
diff --git a/frm/testsuite/frm/DISTFILES b/frm/testsuite/frm/DISTFILES
deleted file mode 100644
index 8382c6b..0000000
--- a/frm/testsuite/frm/DISTFILES
+++ /dev/null
@@ -1 +0,0 @@
-test.exp
\ No newline at end of file
diff --git a/frm/testsuite/frm/test.exp b/frm/testsuite/frm/test.exp
deleted file mode 100644
index 900aae8..0000000
--- a/frm/testsuite/frm/test.exp
+++ /dev/null
@@ -1,65 +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 -retcode 1 -message "frm" "Foo Bar\tJabberwocky"\
-"Bar\tRe: Jabberwocky"\
-"Sergey Poznyakoff\tSimple MIME"\
-"Sergey Poznyakoff\tNested MIME"\
-"Sergey Poznyakoff\tEmpty MIME Parts"
-
-mu_exec -retcode 1 -message "frm -n" -arg -n \
-" 1:\tFoo Bar\tJabberwocky"\
-" 2:\tBar\tRe: Jabberwocky"\
-" 3:\tSergey Poznyakoff\tSimple MIME"\
-" 4:\tSergey Poznyakoff\tNested MIME"\
-" 5:\tSergey Poznyakoff\tEmpty MIME Parts"
-
-mu_exec -retcode 1 -message "frm -l" -arg -l \
-"(Bar)\tFoo Bar\tJabberwocky"\
-"(Foo Bar)\tBar\tRe: Jabberwocky"\
-"(Foo Bar)\tSergey Poznyakoff\tSimple MIME"\
-"(Foo Bar)\tSergey Poznyakoff\tNested MIME"\
-"(Foo Bar)\tSergey Poznyakoff\tEmpty MIME Parts"
-
-mu_exec -retcode 1 -message "frm -qS" -arg -qS \
-"Folder contains 5 new messages."
-
-mu_exec -retcode 1 -arg -q -message "frm -q" \
-"There are messages in that folder."
-
-mu_exec -retcode 1 -arg "--set mailbox.folder=\"'$MU_SPOOL_DIR'\"" -arg +mbox
-message "frm +mbox" \
-"Sergey Poznyakoff\tMBOX"
-
-mu_exec -arg -q -arg %nonexistent -retcode 2 -message "frm -q %nonexistent" \
-"No messages in that folder!"
-
-set env(MAIL) $MU_SPOOL_DIR/bigto.mbox
-unset env(FOLDER)
-mu_exec -retcode 1 -message "frm -l on long headers" -arg -l \
-"(Ayoung-Chee, Nigel Paul -- Nigel Paul Ayoung-Chee)\tPatrick Chan\tNew email
address, etc."
-
-#end of test.exp
diff --git a/imap4d/testsuite/imap4d/fetch.exp
b/imap4d/testsuite/imap4d/fetch.exp
index e61f3b5..005282f 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 \"<address@hidden>\"))"\
-"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 \"<address@hidden>\"))"\
-"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 \"<address@hidden>\"))"\
-"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 \"<address@hidden>\"))"\
-"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 \"<address@hidden>\"))"\
+"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 \"<address@hidden>\"))"\
+"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 \"<address@hidden>\"))"\
+"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 \"<address@hidden>\"))"\
+"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 \"<address@hidden>\"))"\
+"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 \"<address@hidden>\"))"\
"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 address@hidden) "\
+"Received: (from address@hidden)"\
" by nonexistent.net id fBSKI8N04906"\
" for address@hidden; 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 address@hidden) "\
+"Received: (from address@hidden)"\
" by nonexistent.net id fBSKI8N04906"\
" for address@hidden; 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 address@hidden) "\
+"Received: (from address@hidden)"\
" by nonexistent.net id fBSKI8N04906"\
" for address@hidden; 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 address@hidden) "\
+"Received: (from address@hidden)"\
" by nonexistent.net id fBSKI8N04906"\
" for address@hidden; 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 address@hidden) "\
+"Received: (from address@hidden)"\
" by dontmailme.org id fERKR9N16790"\
" for address@hidden; 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 \"<address@hidden>\") BODY ((\"text\"
\"plain\" (\"name\" \"msg.21\" \"charset\" \"us-ascii\") \"<address@hidden>\"
\"Father William Part I\" \"7BIT\" 351 10)((\"application\" \"octet-stream\"
(\"name\" \"msg.22\") \"<address@hidden>\" \"Father William Part II\"
\"base64\" 486)((\"application\" \"octet-stream\" (\"name\" \"msg.23\")
\"<address@hidden>\" \"Father William Part III\" \"base64\"
490)(\"application\" \"octet-stream\" (\"name\" \"msg.24\")
\"<address@hidden>\" \"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 \"<address@hidden>\") BODY ((\"text\"
\"plain\" (\"name\" \"msg.21\" \"charset\" \"us-ascii\") \"<address@hidden>\"
\"Father William Part I\" \"7BIT\" 351 10)((\"application\" \"octet-stream\"
(\"name\" \"msg.22\") \"<address@hidden>\" \"Father William Part II\"
\"base64\" 486)((\"application\" \"octet-stream\" (\"name\" \"msg.23\")
\"<address@hidden>\" \"Father William Part III\" \"base64\"
490)(\"application\" \"octet-stream\" (\"name\" \"msg.24\")
\"<address@hidden>\" \"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 5d6d9ac..fbb52ae 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 address@hidden) "\
+ "Received: (from address@hidden)"\
" by nonexistent.net id fBSKI8N04906"\
" for address@hidden; 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 address@hidden) "\
+ "Received: (from address@hidden)"\
" by nonexistent.net id fBSKI8N04906"\
" for address@hidden; 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 address@hidden) "\
+ "Received: (from address@hidden)"\
" by nonexistent.net id fBSKI8N04906"\
" for address@hidden; 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 address@hidden) "\
+"Received: (from address@hidden)"\
" by dontmailme.org id fERKR9N16790"\
" for address@hidden; 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 address@hidden) "\
+"Received: (from address@hidden)"\
" by dontmailme.org id fERKR9N16790"\
" for address@hidden; 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 4f3ebf4..d2cce6f 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 39cb238..147c16e 100644
--- a/mailbox/testsuite/Mime
+++ b/mailbox/testsuite/Mime
@@ -21,9 +21,9 @@ Message: 1
From: Foo Bar <address@hidden>
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 <address@hidden>
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 <address@hidden>
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 <address@hidden>
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 <address@hidden>
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 d22141f..844b1fe 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/sieve/tests/.gitignore b/readmsg/tests/.gitignore
similarity index 100%
copy from sieve/tests/.gitignore
copy to readmsg/tests/.gitignore
diff --git a/sieve/tests/Makefile.am b/readmsg/tests/Makefile.am
similarity index 84%
copy from sieve/tests/Makefile.am
copy to readmsg/tests/Makefile.am
index 191585d..69c08a9 100644
--- a/sieve/tests/Makefile.am
+++ b/readmsg/tests/Makefile.am
@@ -17,7 +17,6 @@
EXTRA_DIST = $(TESTSUITE_AT) testsuite package.m4
DISTCLEANFILES = atconfig $(check_SCRIPTS)
MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
-#SUBDIRS = etc
## ------------ ##
## package.m4. ##
@@ -40,35 +39,15 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
## ------------ ##
TESTSUITE_AT = \
- action.at\
- address.at\
- allof.at\
- anyof.at\
- compile.at\
- envelope.at\
- exists.at\
- ext.at\
- false.at\
- header.at\
- i-casemap.at\
- i-numeric.at\
- i-octet.at\
- mul-addr.at\
- not.at\
- redirect.at\
- reject.at\
- relational.at\
- size.at\
- true.at\
- testsuite.at\
- version.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) testsuite.at -o address@hidden
+ $(AM_V_GEN)$(AUTOTEST) -I $(srcdir) -I $(top_srcdir)/testsuite
testsuite.at -o address@hidden
$(AM_V_at)mv address@hidden $@
atconfig: $(top_builddir)/config.status
diff --git a/testsuite/spool/mbox1 b/readmsg/tests/all.at
similarity index 76%
copy from testsuite/spool/mbox1
copy to readmsg/tests/all.at
index bc1de8d..741d37d 100644
--- a/testsuite/spool/mbox1
+++ b/readmsg/tests/all.at
@@ -1,10 +1,25 @@
-From address@hidden Fri Dec 28 22:18:09 2001
-Received: (from address@hidden)
- by nonexistent.net id fBSKI8N04906
- for address@hidden; Fri, 28 Dec 2001 22:18:08 +0200
-Date: Fri, 28 Dec 2001 22:18:08 +0200
+# 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 <address@hidden>
-Message-Id: <address@hidden>
To: Bar <address@hidden>
Subject: Jabberwocky
@@ -44,14 +59,9 @@ All mimsy were the borogoves,
And the mome raths outgrabe.
-From address@hidden Fri Dec 28 23:28:09 2001
-Received: (from address@hidden)
- by dontmailme.org id fERKR9N16790
- for address@hidden; Fri, 28 Dec 2001 22:18:08 +0200
Date: Fri, 28 Dec 2001 23:28:08 +0200
From: Bar <address@hidden>
To: Foo Bar <address@hidden>
-Message-Id: <address@hidden>
Subject: Re: Jabberwocky
It seems very pretty, but it's *rather* hard to understand!'
@@ -59,17 +69,8 @@ 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...
-From address@hidden Sat Jul 13 00:43:18 2002
-Organization: Mailutils-tests
-Received: from Mirddin.farlep.net (localhost [127.0.0.1])
- by Mirddin.farlep.net with ESMTP id g6CLhIb05086
- for <address@hidden>; Sat, 13 Jul 2002 00:43:18 +0300
-Message-Id: <address@hidden>
To: Foo Bar <address@hidden>
Subject: Simple MIME
-MIME-Version: 1.0
-Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
-Content-ID: <address@hidden>
Date: Sat, 13 Jul 2002 00:43:18 +0300
From: Sergey Poznyakoff <address@hidden>
@@ -103,17 +104,8 @@
ZWN0bHkgc3VyZSBJIGhhdmUgbm9uZSwKV2h5LCBJIGRvIGl0IGFnYWluIGFuZCBhZ2Fpbi4nCgo=
------- =_aaaaaaaaaa0--
-From address@hidden Sat Jul 13 00:50:58 2002
-Organization: Mailutils-tests
-Received: from Mirddin.farlep.net (localhost [127.0.0.1])
- by Mirddin.farlep.net with ESMTP id g6CLowb05126
- for <address@hidden>; Sat, 13 Jul 2002 00:50:58 +0300
-Message-Id: <address@hidden>
To: Foo Bar <address@hidden>
Subject: Nested MIME
-MIME-Version: 1.0
-Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
-Content-ID: <address@hidden>
Date: Sat, 13 Jul 2002 00:50:58 +0300
From: Sergey Poznyakoff <address@hidden>
@@ -189,17 +181,8 @@ IGtpY2sgeW91IGRvd24gc3RhaXJzIScK
------- =_aaaaaaaaaa0--
-From address@hidden Sat Jul 13 00:43:18 2002
-Organization: Mailutils-tests
-Received: from Mirddin.farlep.net (localhost [127.0.0.1])
- by Mirddin.farlep.net with ESMTP id g6CLhIb05086
- for <address@hidden>; Sat, 13 Jul 2002 00:43:18 +0300
-Message-Id: <address@hidden>
To: Foo Bar <address@hidden>
Subject: Empty MIME Parts
-MIME-Version: 1.0
-Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
-Content-ID: <address@hidden>
Date: Sat, 13 Jul 2002 00:43:18 +0300
From: Sergey Poznyakoff <address@hidden>
@@ -217,3 +200,6 @@ Content-Description: Single line part
------- =_aaaaaaaaaa0--
+
+
+])
diff --git a/sieve/tests/atlocal.in b/readmsg/tests/atlocal.in
similarity index 55%
copy from sieve/tests/atlocal.in
copy to readmsg/tests/atlocal.in
index 19343df..aa0ba44 100644
--- a/sieve/tests/atlocal.in
+++ b/readmsg/tests/atlocal.in
@@ -2,13 +2,6 @@
# Configurable variable values for Mailutils test suite.
# Copyright (C) 2004, 2010 Free Software Foundation, Inc.
address@hidden@:@abs_top_builddir@/sieve:$top_srcdir:$srcdir:$PATH
address@hidden@:@abs_top_builddir@/readmsg:$top_srcdir:$srcdir:$PATH
address@hidden@
address@hidden@
-
-initspool() {
- test -d data || mkdir data
- test -d data/spool || mkdir data/spool
- cp $top_srcdir/testsuite/spool/* data/spool
-}
-
\ No newline at end of file
diff --git a/sieve/tests/ext.at b/readmsg/tests/hdr.at
similarity index 55%
copy from sieve/tests/ext.at
copy to readmsg/tests/hdr.at
index 9e16f9d..ffbcff5 100644
--- a/sieve/tests/ext.at
+++ b/readmsg/tests/hdr.at
@@ -15,30 +15,23 @@
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
# This file is part of Mailfromd testsuite.
-AT_SETUP([loadable extensions: numaddr])
-AT_KEYWORDS([ext])
-
-AT_CHECK([
-MUT_PREREQ_CAPA([HAVE_LIBLTDL])
-
-AT_DATA([prog],[
-require "test-numaddr";
-
-if numaddr [[ "to", "cc" ]] :over 5
- {
- discard;
- }
-])
-
-cp $top_srcdir/testsuite/spool/bigto.mbox .
-
-sieve MUT_SIEVE_CMDLINE dnl
- --clearpath -L "${top_builddir}/examples" -f ./bigto.mbox prog
-],
+READMSGTEST([readmsg -h],[hdr],
+[readmsg -h SOMETHING],
[0],
-[],
-[DISCARD on msg uid 1: marking as deleted
-])
-
-AT_CLEANUP
-
+[From address@hidden Fri Dec 28 23:28:09 2001
+Received: (from address@hidden)
+ by dontmailme.org id fERKR9N16790
+ for address@hidden; Fri, 28 Dec 2001 22:18:08 +0200
+Date: Fri, 28 Dec 2001 23:28:08 +0200
+From: Bar <address@hidden>
+To: Foo Bar <address@hidden>
+Message-Id: <address@hidden>
+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/sieve/tests/envelope.at b/readmsg/tests/nohdr.at
similarity index 74%
copy from sieve/tests/envelope.at
copy to readmsg/tests/nohdr.at
index a12f0ae..fb61e39 100644
--- a/sieve/tests/envelope.at
+++ b/readmsg/tests/nohdr.at
@@ -15,15 +15,13 @@
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
# This file is part of Mailfromd testsuite.
-MUT_TESTCASE([envelope],[test envelope],
-[
-if envelope "from" "address@hidden" {
- discard;
-}
-],[],[0],[],
-[DISCARD on msg uid 1: marking as deleted
-IMPLICIT KEEP on msg uid 2
-IMPLICIT KEEP on msg uid 3
-])
+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 0000000..e7e63f0
--- /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 0000000..a459927
--- /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 <address@hidden>
+To: Bar <address@hidden>
+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 <address@hidden>
+To: Foo Bar <address@hidden>
+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/sieve/tests/envelope.at b/readmsg/tests/weed.at
similarity index 69%
copy from sieve/tests/envelope.at
copy to readmsg/tests/weed.at
index a12f0ae..469cf1a 100644
--- a/sieve/tests/envelope.at
+++ b/readmsg/tests/weed.at
@@ -15,15 +15,16 @@
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
# This file is part of Mailfromd testsuite.
-MUT_TESTCASE([envelope],[test envelope],
-[
-if envelope "from" "address@hidden" {
- discard;
-}
-],[],[0],[],
-[DISCARD on msg uid 1: marking as deleted
-IMPLICIT KEEP on msg uid 2
-IMPLICIT KEEP on msg uid 3
-])
+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 989f590..0000000
--- 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 56b7a01..0000000
--- 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 ##' >
address@hidden
- @echo '# Do not edit here. If you wish to override these values' >>
address@hidden
- @echo '# edit the last section' >> address@hidden
- @echo 'set tool $(DEJATOOL)' >> address@hidden
- @echo "set top_srcdir `cd $(top_srcdir); pwd`" >> address@hidden
- @echo "set srcdir `cd $(srcdir); pwd`" >> address@hidden
- @echo 'set objdir' `pwd` >> address@hidden
- @echo 'set host_alias "$(host_alias)"' >> address@hidden
- @echo 'set host_triplet $(host_triplet)' >> address@hidden
- @echo 'set target_alias "$(target_alias)"' >> address@hidden
- @echo 'set target_triplet $(target_triplet)' >> address@hidden
- @echo 'set build_alias "$(build_alias)"' >> address@hidden
- @echo 'set build_triplet $(build_triplet)' >> address@hidden
- @echo '## All variables above are generated by configure. Do Not Edit
##' >> address@hidden
- @test ! -f site.exp || sed '1,/^## All variables above are.*##/ d'
site.exp >> address@hidden
- @test ! -f site.exp || mv site.exp site.bak
- @mv address@hidden 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.'
>> address@hidden
- @echo '## Please, read file README in this directory for instructions'
>> address@hidden
- @echo '## on how to use this file' >> address@hidden
- @echo "set host_board `hostname`" >> address@hidden
- @echo 'set board_info($$host_board,connect) rlogin' >> address@hidden
- @echo 'set board_info($$host_board,shell_prompt) "\\$$ "' >>
address@hidden
- @echo "set board_info(\$$host_board,top_srcdir) `cd $(top_srcdir);
pwd`" >> address@hidden
- @echo "set board_info(\$$host_board,srcdir) `cd $(srcdir); pwd`" >>
address@hidden
- @echo "set board_info(\$$host_board,objdir) `pwd`" >> address@hidden
- @echo "set board_info(\$$host_board,top_srcdir) `cd $(top_srcdir);
pwd`" >> address@hidden
- @echo "set board_info(\$$host_board,top_builddir) `cd $(top_builddir);
pwd`" >> address@hidden
- @test ! -f remote.exp || mv remote.exp remote.bak
- @mv address@hidden 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 adf7c09..0000000
--- 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 c789962..0000000
--- 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 <address@hidden>"\
-"To: Bar <address@hidden>"\
-"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 <address@hidden>"\
-"To: Foo Bar <address@hidden>"\
-"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 <address@hidden>"\
-"Subject: Simple MIME"\
-"Date: Sat, 13 Jul 2002 00:43:18 +0300"\
-"From: Sergey Poznyakoff <address@hidden>"\
-""\
--- "------- =_aaaaaaaaaa0"\
-"Content-Type: text/plain; name=\"msg.1\"; charset=\"us-ascii\""\
-"Content-ID: <address@hidden>"\
-"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: <address@hidden>"\
-"Content-Description: Father William Part I"\
-"Content-Transfer-Encoding: base64"\
-""\
-"YFlvdSBhcmUgb2xkLCBGYXRoZXIgV2lsbGlhbSwnIHRoZSB5b3VuZyBtYW4gc2FpZCwKYEFuZCB5"\
-"b3VyIGhhaXIgaGFzIGJlY29tZSB2ZXJ5IHdoaXRlOwpBbmQgeWV0IHlvdSBpbmNlc3NhbnRseSBz"\
-"dGFuZCBvbiB5b3VyIGhlYWQtLQpEbyB5b3UgdGhpbmssIGF0IHlvdXIgYWdlLCBpdCBpcyByaWdo"\
-"dD8nCgpgSW4gbXkgeW91dGgsJyBGYXRoZXIgV2lsbGlhbSByZXBsaWVkIHRvIGhpcyBzb24sCmBJ"\
-"IGZlYXJlZCBpdCBtaWdodCBpbmp1cmUgdGhlIGJyYWluOwpCdXQsIG5vdyB0aGF0IEknbSBwZXJm"\
-"ZWN0bHkgc3VyZSBJIGhhdmUgbm9uZSwKV2h5LCBJIGRvIGl0IGFnYWluIGFuZCBhZ2Fpbi4nCgo="\
-""\
--- "------- =_aaaaaaaaaa0--"\
-""\
-"To: Foo Bar <address@hidden>"\
-"Subject: Nested MIME"\
-"Date: Sat, 13 Jul 2002 00:50:58 +0300"\
-"From: Sergey Poznyakoff <address@hidden>"\
-""\
--- "------- =_aaaaaaaaaa0"\
-"Content-Type: text/plain; name=\"msg.21\"; charset=\"us-ascii\""\
-"Content-ID: <address@hidden>"\
-"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: <address@hidden>"\
-""\
--- "------- =_aaaaaaaaaa1"\
-"Content-Type: application/octet-stream; name=\"msg.22\""\
-"Content-ID: <address@hidden>"\
-"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: <address@hidden>"\
-""\
--- "------- =_aaaaaaaaaa2"\
-"Content-Type: application/octet-stream; name=\"msg.23\""\
-"Content-ID: <address@hidden>"\
-"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: <address@hidden>"\
-"Content-Description: Father William Part IV"\
-"Content-Transfer-Encoding: base64"\
-""\
-"YFlvdSBhcmUgb2xkLCcgc2FpZCB0aGUgeW91dGgsIGBvbmUgd291bGQgaGFyZGx5IHN1cHBvc2UK"\
-"VGhhdCB5b3VyIGV5ZSB3YXMgYXMgc3RlYWR5IGFzIGV2ZXI7CllldCB5b3UgYmFsYW5jZWQgYW4g"\
-"ZWVsIG9uIHRoZSBlbmQgb2YgeW91ciBub3NlLS0KV2hhdCBtYWRlIHlvdSBzbyBhd2Z1bGx5IGNs"\
-"ZXZlcj8nCgpgSSBoYXZlIGFuc3dlcmVkIHRocmVlIHF1ZXN0aW9ucywgYW5kIHRoYXQgaXMgZW5v"\
-"dWdoLCcKU2FpZCBoaXMgZmF0aGVyOyBgZG9uJ3QgZ2l2ZSB5b3Vyc2VsZiBhaXJzIQpEbyB5b3Ug"\
-"dGhpbmsgSSBjYW4gbGlzdGVuIGFsbCBkYXkgdG8gc3VjaCBzdHVmZj8KQmUgb2ZmLCBvciBJJ2xs"\
-"IGtpY2sgeW91IGRvd24gc3RhaXJzIScK"\
-""\
--- "------- =_aaaaaaaaaa2--"\
-""\
--- "------- =_aaaaaaaaaa1--"\
-""\
--- "------- =_aaaaaaaaaa0--"\
-""\
-"To: Foo Bar <address@hidden>"\
-"Subject: Empty MIME Parts"\
-"Date: Sat, 13 Jul 2002 00:43:18 +0300"\
-"From: Sergey Poznyakoff <address@hidden>"\
-""\
--- "------- =_aaaaaaaaaa0"\
-"Content-Type: text/plain; name=\"empty\"; charset=\"us-ascii\""\
-"Content-ID: <address@hidden>"\
-"Content-Description: Empty part"\
-""\
-""\
--- "------- =_aaaaaaaaaa0"\
-"Content-Type: text/plain; name=\"single.line\"; charset=\"us-ascii\""\
-"Content-ID: <address@hidden>"\
-"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 <address@hidden>"\
-"To: Bar <address@hidden>"\
-"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 <address@hidden>"\
-"To: Foo Bar <address@hidden>"\
-"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 address@hidden Fri Dec 28 23:28:09 2001"\
-"Received: (from address@hidden) "\
-" by dontmailme.org id fERKR9N16790"\
-" for address@hidden; Fri, 28 Dec 2001 22:18:08 +0200"\
-"Date: Fri, 28 Dec 2001 23:28:08 +0200"\
-"From: Bar <address@hidden>"\
-"To: Foo Bar <address@hidden>"\
-"Message-Id: <address@hidden>"\
-"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/Makefile.am b/sieve/tests/Makefile.am
index 191585d..8a79022 100644
--- a/sieve/tests/Makefile.am
+++ b/sieve/tests/Makefile.am
@@ -68,7 +68,7 @@ M4=m4
AUTOTEST = $(AUTOM4TE) --language=autotest
$(TESTSUITE): package.m4 $(TESTSUITE_AT)
- $(AM_V_GEN)$(AUTOTEST) -I $(srcdir) testsuite.at -o address@hidden
+ $(AM_V_GEN)$(AUTOTEST) -I $(srcdir) -I $(top_srcdir)/testsuite
testsuite.at -o address@hidden
$(AM_V_at)mv address@hidden $@
atconfig: $(top_builddir)/config.status
diff --git a/sieve/tests/testsuite.at b/sieve/tests/testsuite.at
index 5070269..c6d7b82 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 e8ae423..5b8fc36 100644
--- a/sieve/tests/version.at
+++ b/sieve/tests/version.at
@@ -15,20 +15,6 @@
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
# This file is part of Mailfromd testsuite.
-AT_SETUP([sieve version])
+m4_include([testsuite.inc])
-AT_CHECK([sieve --version | sed '1{s/ *[\[.*\]]//;q}' ],
- [0],
- [sieve (AT_PACKAGE_NAME) AT_PACKAGE_VERSION
-],
-[],
-[cat >$[]XFAILFILE <<'_EOT'
-
-==============================================================
-WARNING: Not using the proper version, *all* checks dubious...
-==============================================================
-_EOT
-],
-[rm -f $[]XFAILFILE])
-
-AT_CLEANUP
+MUT_VERSION(sieve)
diff --git a/testsuite/spool/mbox1 b/testsuite/spool/mbox1
index bc1de8d..dee5a97 100644
--- a/testsuite/spool/mbox1
+++ b/testsuite/spool/mbox1
@@ -1,5 +1,5 @@
From address@hidden Fri Dec 28 22:18:09 2001
-Received: (from address@hidden)
+Received: (from address@hidden)
by nonexistent.net id fBSKI8N04906
for address@hidden; 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 address@hidden Fri Dec 28 23:28:09 2001
-Received: (from address@hidden)
+Received: (from address@hidden)
by dontmailme.org id fERKR9N16790
for address@hidden; 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 address@hidden 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 <address@hidden>; Sat, 13 Jul 2002 00:43:18 +0300
Message-Id: <address@hidden>
@@ -105,7 +105,7 @@
ZWN0bHkgc3VyZSBJIGhhdmUgbm9uZSwKV2h5LCBJIGRvIGl0IGFnYWluIGFuZCBhZ2Fpbi4nCgo=
From address@hidden 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 <address@hidden>; Sat, 13 Jul 2002 00:50:58 +0300
Message-Id: <address@hidden>
@@ -191,7 +191,7 @@ IGtpY2sgeW91IGRvd24gc3RhaXJzIScK
From address@hidden 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 <address@hidden>; Sat, 13 Jul 2002 00:43:18 +0300
Message-Id: <address@hidden>
diff --git a/sieve/tests/version.at b/testsuite/testsuite.inc
similarity index 74%
copy from sieve/tests/version.at
copy to testsuite/testsuite.inc
index e8ae423..8d5b610 100644
--- a/sieve/tests/version.at
+++ b/testsuite/testsuite.inc
@@ -15,14 +15,18 @@
# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
# This file is part of Mailfromd testsuite.
-AT_SETUP([sieve version])
+dnl ------------------------------------------------------------
+dnl MUT_VERSION(TOOL) -- checks the version output from TOOL
+dnl
+m4_define([MUT_VERSION],[
+AT_SETUP([$1 version])
-AT_CHECK([sieve --version | sed '1{s/ *[\[.*\]]//;q}' ],
+AT_CHECK([$1 --version | sed '1{s/ *[\[.*\]]//;q}' ],
[0],
- [sieve (AT_PACKAGE_NAME) AT_PACKAGE_VERSION
+ [$1 (AT_PACKAGE_NAME) AT_PACKAGE_VERSION
],
[],
-[cat >$[]XFAILFILE <<'_EOT'
+[cat >.xfailfile <<'_EOT'
==============================================================
WARNING: Not using the proper version, *all* checks dubious...
@@ -32,3 +36,7 @@ _EOT
[rm -f $[]XFAILFILE])
AT_CLEANUP
+])
+
+m4_define([AT_SKIP_TEST],[exit 77])
+
hooks/post-receive
--
GNU Mailutils
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Mailutils branch, master, updated. release-2.2-73-gd1d548e,
Sergey Poznyakoff <=