summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2021-01-11 20:01:16 +0200
committerSergey Poznyakoff <gray@gnu.org>2021-01-11 20:01:16 +0200
commit77cf5f0fd756ccef6ae133fd62fe13073f42373f (patch)
tree552eac43f3f6d6e453b460fb23103b0b6f7926a0
parentdd8ed22c2dfcecf419e2c7a35cd344698448e2ad (diff)
downloadmailutils-77cf5f0fd756ccef6ae133fd62fe13073f42373f.tar.gz
mailutils-77cf5f0fd756ccef6ae133fd62fe13073f42373f.tar.bz2
Fix architecture-dependent test failures
* configure.ac (MU_COND_MAILBOX_QUOTA): Fix test condition. * libproto/dotmail/tests/atlocal.in (x_imapbase_normalize): New function. * libproto/mbox/tests/atlocal.in: Likewise. * libproto/dotmail/tests/delete.at: Filter output through x_imapbase_normalize to avoid triggering false negative due to padding differences. * libproto/mbox/tests/delete.at: Likewise.
-rw-r--r--configure.ac2
-rw-r--r--libproto/dotmail/tests/atlocal.in3
-rw-r--r--libproto/dotmail/tests/delete.at16
-rw-r--r--libproto/mbox/tests/atlocal.in3
-rw-r--r--libproto/mbox/tests/delete.at16
5 files changed, 23 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac
index 6d6f4bc99..f560142f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -994,7 +994,7 @@ fi
994 994
995 995
996# Mailbox quota support 996# Mailbox quota support
997AM_CONDITIONAL([MU_COND_MAILBOX_QUOTA],[test -n "$status_dbm$status_mysql"]) 997AM_CONDITIONAL([MU_COND_MAILBOX_QUOTA],[test "$status_dbm$status_mysql" != "nono"])
998 998
999 999
1000# Virtual domain support 1000# Virtual domain support
diff --git a/libproto/dotmail/tests/atlocal.in b/libproto/dotmail/tests/atlocal.in
index d591631fe..a6b40263a 100644
--- a/libproto/dotmail/tests/atlocal.in
+++ b/libproto/dotmail/tests/atlocal.in
@@ -3,3 +3,6 @@
3# Copyright (C) 2004-2021 Free Software Foundation, Inc. 3# Copyright (C) 2004-2021 Free Software Foundation, Inc.
4 4
5PATH=@abs_builddir@:@abs_builddir@/..:$top_srcdir:$srcdir:$PATH 5PATH=@abs_builddir@:@abs_builddir@/..:$top_srcdir:$srcdir:$PATH
6x_imapbase_normalize() {
7 sed -e '/^X-IMAPbase:/s/ */ /g'
8}
diff --git a/libproto/dotmail/tests/delete.at b/libproto/dotmail/tests/delete.at
index 325497898..446136b78 100644
--- a/libproto/dotmail/tests/delete.at
+++ b/libproto/dotmail/tests/delete.at
@@ -146,7 +146,7 @@ uid
146headers 146headers
147]) 147])
148 148
149AT_CHECK([mbop -m inbox1 < commands1], 149AT_CHECK([mbop -m inbox1 < commands1|x_imapbase_normalize],
150[0], 150[0],
151[1 current message 151[1 current message
1521 set_deleted: OK 1521 set_deleted: OK
@@ -164,7 +164,7 @@ From:March Hare <hare@wonder.land>
164Message-Id:<200207292200.3303@wonder.land> 164Message-Id:<200207292200.3303@wonder.land>
165To:Alice <alice@wonder.land> 165To:Alice <alice@wonder.land>
166Subject:Re: Invitation 166Subject:Re: Invitation
167X-IMAPbase:10 9 167X-IMAPbase:10 9
168X-UID:3 168X-UID:3
169 169
1702 current message 1702 current message
@@ -203,7 +203,7 @@ uid
203headers 203headers
204]) 204])
205 205
206AT_CHECK([mbop -m inbox1 < commands1a], 206AT_CHECK([mbop -m inbox1 < commands1a|x_imapbase_normalize],
207[0], 207[0],
208[count: 3 208[count: 3
2091 current message 2091 current message
@@ -214,7 +214,7 @@ From:March Hare <hare@wonder.land>
214Message-Id:<200207292200.3303@wonder.land> 214Message-Id:<200207292200.3303@wonder.land>
215To:Alice <alice@wonder.land> 215To:Alice <alice@wonder.land>
216Subject:Re: Invitation 216Subject:Re: Invitation
217X-IMAPbase:10 9 217X-IMAPbase:10 9
218X-UID:3 218X-UID:3
219 219
2202 current message 2202 current message
@@ -260,7 +260,7 @@ uid
260headers 260headers
261]) 261])
262 262
263AT_CHECK([mbop -m inbox2 < commands2], 263AT_CHECK([mbop -m inbox2 < commands2|x_imapbase_normalize],
264[0], 264[0],
265[1 current message 265[1 current message
2661 set_deleted: OK 2661 set_deleted: OK
@@ -278,7 +278,7 @@ From:Alice <alice@wonder.land>
278Message-Id:<200207292200.3302@wonder.land> 278Message-Id:<200207292200.3302@wonder.land>
279To:March Hare <hare@wonder.land> 279To:March Hare <hare@wonder.land>
280Subject:Re: Invitation 280Subject:Re: Invitation
281X-IMAPbase:10 9 281X-IMAPbase:10 9
282X-UID:2 282X-UID:2
283 283
2842 current message 2842 current message
@@ -316,7 +316,7 @@ uid
316headers 316headers
317]) 317])
318 318
319AT_CHECK([mbop -m inbox2 < commands2a], 319AT_CHECK([mbop -m inbox2 < commands2a|x_imapbase_normalize],
320[0], 320[0],
321[count: 3 321[count: 3
3221 current message 3221 current message
@@ -327,7 +327,7 @@ From:Alice <alice@wonder.land>
327Message-Id:<200207292200.3302@wonder.land> 327Message-Id:<200207292200.3302@wonder.land>
328To:March Hare <hare@wonder.land> 328To:March Hare <hare@wonder.land>
329Subject:Re: Invitation 329Subject:Re: Invitation
330X-IMAPbase:10 9 330X-IMAPbase:10 9
331X-UID:2 331X-UID:2
332 332
3332 current message 3332 current message
diff --git a/libproto/mbox/tests/atlocal.in b/libproto/mbox/tests/atlocal.in
index 8be70d0b9..2ee48829b 100644
--- a/libproto/mbox/tests/atlocal.in
+++ b/libproto/mbox/tests/atlocal.in
@@ -4,3 +4,6 @@
4 4
5PATH=@abs_builddir@:@abs_top_builddir@/testsuite:$PATH 5PATH=@abs_builddir@:@abs_top_builddir@/testsuite:$PATH
6spooldir=$abs_top_srcdir/testsuite/spool/ 6spooldir=$abs_top_srcdir/testsuite/spool/
7x_imapbase_normalize() {
8 sed -e '/^X-IMAPbase:/s/ */ /g'
9}
diff --git a/libproto/mbox/tests/delete.at b/libproto/mbox/tests/delete.at
index 8a5d97b38..cbec95869 100644
--- a/libproto/mbox/tests/delete.at
+++ b/libproto/mbox/tests/delete.at
@@ -150,7 +150,7 @@ uid
150headers 150headers
151]) 151])
152 152
153AT_CHECK([mbop -m inbox1 < commands1], 153AT_CHECK([mbop -m inbox1 < commands1|x_imapbase_normalize],
154[0], 154[0],
155[1 current message 155[1 current message
1561 set_deleted: OK 1561 set_deleted: OK
@@ -168,7 +168,7 @@ From:March Hare <hare@wonder.land>
168Message-Id:<200207292200.3303@wonder.land> 168Message-Id:<200207292200.3303@wonder.land>
169To:Alice <alice@wonder.land> 169To:Alice <alice@wonder.land>
170Subject:Re: Invitation 170Subject:Re: Invitation
171X-IMAPbase:10 9 171X-IMAPbase:10 9
172X-UID:3 172X-UID:3
173 173
1742 current message 1742 current message
@@ -207,7 +207,7 @@ uid
207headers 207headers
208]) 208])
209 209
210AT_CHECK([mbop -m inbox1 < commands1a], 210AT_CHECK([mbop -m inbox1 < commands1a|x_imapbase_normalize],
211[0], 211[0],
212[count: 3 212[count: 3
2131 current message 2131 current message
@@ -218,7 +218,7 @@ From:March Hare <hare@wonder.land>
218Message-Id:<200207292200.3303@wonder.land> 218Message-Id:<200207292200.3303@wonder.land>
219To:Alice <alice@wonder.land> 219To:Alice <alice@wonder.land>
220Subject:Re: Invitation 220Subject:Re: Invitation
221X-IMAPbase:10 9 221X-IMAPbase:10 9
222X-UID:3 222X-UID:3
223 223
2242 current message 2242 current message
@@ -264,7 +264,7 @@ uid
264headers 264headers
265]) 265])
266 266
267AT_CHECK([mbop -m inbox2 < commands2], 267AT_CHECK([mbop -m inbox2 < commands2|x_imapbase_normalize],
268[0], 268[0],
269[1 current message 269[1 current message
2701 set_deleted: OK 2701 set_deleted: OK
@@ -282,7 +282,7 @@ From:Alice <alice@wonder.land>
282Message-Id:<200207292200.3302@wonder.land> 282Message-Id:<200207292200.3302@wonder.land>
283To:March Hare <hare@wonder.land> 283To:March Hare <hare@wonder.land>
284Subject:Re: Invitation 284Subject:Re: Invitation
285X-IMAPbase:10 9 285X-IMAPbase:10 9
286X-UID:2 286X-UID:2
287 287
2882 current message 2882 current message
@@ -320,7 +320,7 @@ uid
320headers 320headers
321]) 321])
322 322
323AT_CHECK([mbop -m inbox2 < commands2a], 323AT_CHECK([mbop -m inbox2 < commands2a|x_imapbase_normalize],
324[0], 324[0],
325[count: 3 325[count: 3
3261 current message 3261 current message
@@ -331,7 +331,7 @@ From:Alice <alice@wonder.land>
331Message-Id:<200207292200.3302@wonder.land> 331Message-Id:<200207292200.3302@wonder.land>
332To:March Hare <hare@wonder.land> 332To:March Hare <hare@wonder.land>
333Subject:Re: Invitation 333Subject:Re: Invitation
334X-IMAPbase:10 9 334X-IMAPbase:10 9
335X-UID:2 335X-UID:2
336 336
3372 current message 3372 current message

Return to:

Send suggestions and report system problems to the System administrator.