[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Mailutils branch, master, updated. release-2.2-84-gc22a073
|
From: |
Sergey Poznyakoff |
|
Subject: |
[SCM] GNU Mailutils branch, master, updated. release-2.2-84-gc22a073 |
|
Date: |
Fri, 17 Sep 2010 10:50:38 +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=c22a0737039761f7f4ae222e27573bec0ac79f85
The branch, master has been updated
via c22a0737039761f7f4ae222e27573bec0ac79f85 (commit)
from 20300ee417e027c1f2157a2e733982144ed35833 (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 c22a0737039761f7f4ae222e27573bec0ac79f85
Author: Sergey Poznyakoff <address@hidden>
Date: Fri Sep 17 13:49:46 2010 +0300
testsuite: recreate missing maildir entries
Git does not keep empty subdirectories, so we need to recreate /cur and
/tmp subdirs in maildir mailboxes retrieved from the repo.
* bootstrap.conf: Recreate missing maildir parts.
* testsuite/testsuite.inc (MUT_MBCOPY): New macro.
* sieve/tests/ext.at: Use MUT_MBCOPY to copy mailboxes.
* sieve/tests/redirect.at: Likewise.
* sieve/tests/reject.at: Likewise.
* sieve/tests/testsuite.at: Likewise.
* testsuite/mbdel.at: Likewise.
* frm/tests/Makefile.am: Testsuite depends on
$(top_srcdir)/testsuite/testsuite.inc.
* libmailutils/tests/Makefile.am: Likewise.
* messages/tests/Makefile.am: Likewise.
* readmsg/tests/Makefile.am: Likewise.
* sieve/tests/Makefile.am: Likewise.
* testsuite/Makefile.am: Likewise.
-----------------------------------------------------------------------
Summary of changes:
bootstrap.conf | 8 ++++++++
frm/tests/Makefile.am | 2 +-
libmailutils/tests/Makefile.am | 2 +-
messages/tests/Makefile.am | 2 +-
readmsg/tests/Makefile.am | 2 +-
sieve/tests/Makefile.am | 2 +-
sieve/tests/ext.at | 3 +--
sieve/tests/redirect.at | 3 +--
sieve/tests/reject.at | 3 +--
sieve/tests/testsuite.at | 3 +--
testsuite/Makefile.am | 2 +-
testsuite/mbdel.at | 15 +++++----------
testsuite/testsuite.inc | 12 ++++++++++++
13 files changed, 35 insertions(+), 24 deletions(-)
diff --git a/bootstrap.conf b/bootstrap.conf
index 2537767..5a9561d 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -89,3 +89,11 @@ if [ -r .bootstrap ]; then
echo "$0: Reading configuration file .bootstrap"
eval set -- "`sed 's/#.*$//;/^$/d' .bootstrap | tr '\n' ' '` $*"
fi
+
+# Recreate missing maildir parts
+for mbox in testsuite/maildir/*
+do
+ test -d $mbox/new || mkdir $mbox/new
+ test -d $mbox/cur || mkdir $mbox/cur
+ test -d $mbox/tmp || mkdir $mbox/tmp
+done
diff --git a/frm/tests/Makefile.am b/frm/tests/Makefile.am
index be7ac10..b548c51 100644
--- a/frm/tests/Makefile.am
+++ b/frm/tests/Makefile.am
@@ -44,7 +44,7 @@ TESTSUITE = $(srcdir)/testsuite
M4=m4
AUTOTEST = $(AUTOM4TE) --language=autotest
-$(TESTSUITE): package.m4 $(TESTSUITE_AT)
+$(TESTSUITE): package.m4 $(TESTSUITE_AT) $(top_srcdir)/testsuite/testsuite.inc
$(AM_V_GEN)$(AUTOTEST) -I $(srcdir) -I $(top_srcdir)/testsuite
testsuite.at -o address@hidden
$(AM_V_at)mv address@hidden $@
diff --git a/libmailutils/tests/Makefile.am b/libmailutils/tests/Makefile.am
index 52161b4..7324e88 100644
--- a/libmailutils/tests/Makefile.am
+++ b/libmailutils/tests/Makefile.am
@@ -73,7 +73,7 @@ TESTSUITE = $(srcdir)/testsuite
M4=m4
AUTOTEST = $(AUTOM4TE) --language=autotest
-$(TESTSUITE): package.m4 $(TESTSUITE_AT)
+$(TESTSUITE): package.m4 $(TESTSUITE_AT) $(top_srcdir)/testsuite/testsuite.inc
$(AM_V_GEN)$(AUTOTEST) -I $(srcdir) -I $(top_srcdir)/testsuite
testsuite.at -o address@hidden
$(AM_V_at)mv address@hidden $@
diff --git a/messages/tests/Makefile.am b/messages/tests/Makefile.am
index be7ac10..b548c51 100644
--- a/messages/tests/Makefile.am
+++ b/messages/tests/Makefile.am
@@ -44,7 +44,7 @@ TESTSUITE = $(srcdir)/testsuite
M4=m4
AUTOTEST = $(AUTOM4TE) --language=autotest
-$(TESTSUITE): package.m4 $(TESTSUITE_AT)
+$(TESTSUITE): package.m4 $(TESTSUITE_AT) $(top_srcdir)/testsuite/testsuite.inc
$(AM_V_GEN)$(AUTOTEST) -I $(srcdir) -I $(top_srcdir)/testsuite
testsuite.at -o address@hidden
$(AM_V_at)mv address@hidden $@
diff --git a/readmsg/tests/Makefile.am b/readmsg/tests/Makefile.am
index 59dce6f..662a627 100644
--- a/readmsg/tests/Makefile.am
+++ b/readmsg/tests/Makefile.am
@@ -46,7 +46,7 @@ TESTSUITE = $(srcdir)/testsuite
M4=m4
AUTOTEST = $(AUTOM4TE) --language=autotest
-$(TESTSUITE): package.m4 $(TESTSUITE_AT)
+$(TESTSUITE): package.m4 $(TESTSUITE_AT) $(top_srcdir)/testsuite/testsuite.inc
$(AM_V_GEN)$(AUTOTEST) -I $(srcdir) -I $(top_srcdir)/testsuite
testsuite.at -o address@hidden
$(AM_V_at)mv address@hidden $@
diff --git a/sieve/tests/Makefile.am b/sieve/tests/Makefile.am
index a7494bc..fc83481 100644
--- a/sieve/tests/Makefile.am
+++ b/sieve/tests/Makefile.am
@@ -67,7 +67,7 @@ TESTSUITE = $(srcdir)/testsuite
M4=m4
AUTOTEST = $(AUTOM4TE) --language=autotest
-$(TESTSUITE): package.m4 $(TESTSUITE_AT)
+$(TESTSUITE): package.m4 $(TESTSUITE_AT) $(top_srcdir)/testsuite/testsuite.inc
$(AM_V_GEN)$(AUTOTEST) -I $(srcdir) -I $(top_srcdir)/testsuite
testsuite.at -o address@hidden
$(AM_V_at)mv address@hidden $@
diff --git a/sieve/tests/ext.at b/sieve/tests/ext.at
index e53561a..16d846a 100644
--- a/sieve/tests/ext.at
+++ b/sieve/tests/ext.at
@@ -30,8 +30,7 @@ if numaddr [[ "to", "cc" ]] :over 5
}
])
-cp $abs_top_srcdir/testsuite/spool/bigto.mbox .
-chmod +w bigto.mbox
+MUT_MBCOPY($abs_top_srcdir/testsuite/spool/bigto.mbox)
sieve MUT_SIEVE_CMDLINE dnl
--clearpath -L "${abs_top_builddir}/examples" -f ./bigto.mbox prog
diff --git a/sieve/tests/redirect.at b/sieve/tests/redirect.at
index e51320d..fbe43c2 100644
--- a/sieve/tests/redirect.at
+++ b/sieve/tests/redirect.at
@@ -29,8 +29,7 @@ require "redirect";
redirect "address@hidden";
])
-cp $abs_top_srcdir/testsuite/spool/MUT_SIEVE_MAILBOX .
-chmod +w MUT_SIEVE_MAILBOX
+MUT_MBCOPY($abs_top_srcdir/testsuite/spool/MUT_SIEVE_MAILBOX)
sieve MUT_SIEVE_CMDLINE MUT_SIEVE_OPTIONS -f ./MUT_SIEVE_MAILBOX prog || exit 1
sed 's/ $//' ./mta.diag
diff --git a/sieve/tests/reject.at b/sieve/tests/reject.at
index 6685a2e..5b38139 100644
--- a/sieve/tests/reject.at
+++ b/sieve/tests/reject.at
@@ -46,8 +46,7 @@ s/^\( *[[0-9]][[0-9]]*: The original message was received at
*\).*\( from .*\)/\
s/^\( *[[0-9]][[0-9]]*: Last-Attempt-Date:\).*/\1 (date)/
])
-cp $abs_top_srcdir/testsuite/spool/MUT_SIEVE_MAILBOX .
-chmod +w MUT_SIEVE_MAILBOX
+MUT_MBCOPY($abs_top_srcdir/testsuite/spool/MUT_SIEVE_MAILBOX)
sieve MUT_SIEVE_CMDLINE MUT_SIEVE_OPTIONS -f ./MUT_SIEVE_MAILBOX prog || exit 1
sed -f filter.sed ./mta.diag
diff --git a/sieve/tests/testsuite.at b/sieve/tests/testsuite.at
index 26c0211..c32aba6 100644
--- a/sieve/tests/testsuite.at
+++ b/sieve/tests/testsuite.at
@@ -70,8 +70,7 @@ AT_CHECK([sieve MUT_SIEVE_CMDLINE MUT_SIEVE_OPTIONS -f $2 prog
m4_define([MUT_TESTCASE],[
AT_SETUP([$1])
AT_KEYWORDS([$2])
-cp $abs_top_srcdir/testsuite/spool/MUT_SIEVE_MAILBOX .
-chmod +w MUT_SIEVE_MAILBOX
+MUT_MBCOPY($abs_top_srcdir/testsuite/spool/MUT_SIEVE_MAILBOX)
MUT_SIEVE_RUN([$3], ./MUT_SIEVE_MAILBOX, m4_shift(m4_shift(m4_shift($@))))
AT_CLEANUP])
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index bbe2493..89322cd 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -68,7 +68,7 @@ TESTSUITE = $(srcdir)/testsuite
M4=m4
AUTOTEST = $(AUTOM4TE) --language=autotest
-$(TESTSUITE): package.m4 $(TESTSUITE_AT)
+$(TESTSUITE): package.m4 $(TESTSUITE_AT) $(top_srcdir)/testsuite/testsuite.inc
$(AM_V_GEN)$(AUTOTEST) -I $(srcdir) -I $(top_srcdir)/testsuite
testsuite.at -o address@hidden
$(AM_V_at)mv address@hidden $@
diff --git a/testsuite/mbdel.at b/testsuite/mbdel.at
index 8ce8e29..a63e261 100644
--- a/testsuite/mbdel.at
+++ b/testsuite/mbdel.at
@@ -28,32 +28,28 @@ AT_CLEANUP
dnl ------------------------------------------------------------
MBDEL_TEST([mbox],
-[cp $abs_top_srcdir/testsuite/spool/mbox1 .
-chmod +w mbox1
+[MUT_MBCOPY($abs_top_srcdir/testsuite/spool/mbox1)
mbdel mbox:mbox1 || exit 2
test -f mbox1
],
[1])
MBDEL_TEST([mh],
-[cp -r $abs_top_srcdir/testsuite/mh/mbox1 .
-chmod -R +w mbox1
+[MUT_MBCOPY($abs_top_srcdir/testsuite/mh/mbox1)
mbdel mh:mbox1 || exit 2
test -d mbox1
],
[1])
MBDEL_TEST([maildir],
-[cp -r $abs_top_srcdir/testsuite/maildir/mbox1 .
-chmod -R +w mbox1
+[MUT_MBCOPY($abs_top_srcdir/testsuite/maildir/mbox1)
mbdel maildir:mbox1 || exit 2
test -d mbox1
],
[1])
MBDEL_TEST([mh with subdirs],
-[cp -r $abs_top_srcdir/testsuite/mh/mbox1 .
-chmod -R +w mbox1
+[MUT_MBCOPY($abs_top_srcdir/testsuite/mh/mbox1)
mkdir mbox1/subfolder
mbdel mh:mbox1 || exit 2
test -d mbox1 && find mbox1
@@ -65,8 +61,7 @@ mbox1/subfolder
])
MBDEL_TEST([maildir with subdirs],
-[cp -r $abs_top_srcdir/testsuite/maildir/mbox1 .
-chmod -R +w mbox1
+[MUT_MBCOPY($abs_top_srcdir/testsuite/maildir/mbox1)
mkdir mbox1/subfolder
mbdel maildir:mbox1 || exit 2
test -d mbox1 && find mbox1
diff --git a/testsuite/testsuite.inc b/testsuite/testsuite.inc
index 875f4ad..56f4538 100644
--- a/testsuite/testsuite.inc
+++ b/testsuite/testsuite.inc
@@ -43,3 +43,15 @@ _EOT
AT_CLEANUP
])
+dnl ------------------------------------------------------------
+dnl MUT_MBCOPY(SRC, DST) -- Copy mailbox SRC to DST.
+dnl
+dnl
+m4_define([MUT_MBCOPY],[
+m4_pushdef([__dst],[m4_if([$2],,[.],[$2])])
+m4_pushdef([__basename],[m4_bregexp($1,[.*/\([^/]+\)$],\1)])
+cp -r $1 __dst
+chmod -R +w __dst/__basename
+m4_popdef([__basename])
+m4_popdef([__dst])
+])
hooks/post-receive
--
GNU Mailutils
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Mailutils branch, master, updated. release-2.2-84-gc22a073,
Sergey Poznyakoff <=