diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2021-01-11 20:01:16 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2021-01-11 20:01:16 +0200 |
commit | 77cf5f0fd756ccef6ae133fd62fe13073f42373f (patch) | |
tree | 552eac43f3f6d6e453b460fb23103b0b6f7926a0 | |
parent | dd8ed22c2dfcecf419e2c7a35cd344698448e2ad (diff) | |
download | mailutils-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.ac | 2 | ||||
-rw-r--r-- | libproto/dotmail/tests/atlocal.in | 3 | ||||
-rw-r--r-- | libproto/dotmail/tests/delete.at | 16 | ||||
-rw-r--r-- | libproto/mbox/tests/atlocal.in | 3 | ||||
-rw-r--r-- | libproto/mbox/tests/delete.at | 16 |
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 |
997 | AM_CONDITIONAL([MU_COND_MAILBOX_QUOTA],[test -n "$status_dbm$status_mysql"]) | 997 | AM_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 | ||
5 | PATH=@abs_builddir@:@abs_builddir@/..:$top_srcdir:$srcdir:$PATH | 5 | PATH=@abs_builddir@:@abs_builddir@/..:$top_srcdir:$srcdir:$PATH |
6 | x_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 | |||
146 | headers | 146 | headers |
147 | ]) | 147 | ]) |
148 | 148 | ||
149 | AT_CHECK([mbop -m inbox1 < commands1], | 149 | AT_CHECK([mbop -m inbox1 < commands1|x_imapbase_normalize], |
150 | [0], | 150 | [0], |
151 | [1 current message | 151 | [1 current message |
152 | 1 set_deleted: OK | 152 | 1 set_deleted: OK |
@@ -164,7 +164,7 @@ From:March Hare <hare@wonder.land> | |||
164 | Message-Id:<200207292200.3303@wonder.land> | 164 | Message-Id:<200207292200.3303@wonder.land> |
165 | To:Alice <alice@wonder.land> | 165 | To:Alice <alice@wonder.land> |
166 | Subject:Re: Invitation | 166 | Subject:Re: Invitation |
167 | X-IMAPbase:10 9 | 167 | X-IMAPbase:10 9 |
168 | X-UID:3 | 168 | X-UID:3 |
169 | 169 | ||
170 | 2 current message | 170 | 2 current message |
@@ -203,7 +203,7 @@ uid | |||
203 | headers | 203 | headers |
204 | ]) | 204 | ]) |
205 | 205 | ||
206 | AT_CHECK([mbop -m inbox1 < commands1a], | 206 | AT_CHECK([mbop -m inbox1 < commands1a|x_imapbase_normalize], |
207 | [0], | 207 | [0], |
208 | [count: 3 | 208 | [count: 3 |
209 | 1 current message | 209 | 1 current message |
@@ -214,7 +214,7 @@ From:March Hare <hare@wonder.land> | |||
214 | Message-Id:<200207292200.3303@wonder.land> | 214 | Message-Id:<200207292200.3303@wonder.land> |
215 | To:Alice <alice@wonder.land> | 215 | To:Alice <alice@wonder.land> |
216 | Subject:Re: Invitation | 216 | Subject:Re: Invitation |
217 | X-IMAPbase:10 9 | 217 | X-IMAPbase:10 9 |
218 | X-UID:3 | 218 | X-UID:3 |
219 | 219 | ||
220 | 2 current message | 220 | 2 current message |
@@ -260,7 +260,7 @@ uid | |||
260 | headers | 260 | headers |
261 | ]) | 261 | ]) |
262 | 262 | ||
263 | AT_CHECK([mbop -m inbox2 < commands2], | 263 | AT_CHECK([mbop -m inbox2 < commands2|x_imapbase_normalize], |
264 | [0], | 264 | [0], |
265 | [1 current message | 265 | [1 current message |
266 | 1 set_deleted: OK | 266 | 1 set_deleted: OK |
@@ -278,7 +278,7 @@ From:Alice <alice@wonder.land> | |||
278 | Message-Id:<200207292200.3302@wonder.land> | 278 | Message-Id:<200207292200.3302@wonder.land> |
279 | To:March Hare <hare@wonder.land> | 279 | To:March Hare <hare@wonder.land> |
280 | Subject:Re: Invitation | 280 | Subject:Re: Invitation |
281 | X-IMAPbase:10 9 | 281 | X-IMAPbase:10 9 |
282 | X-UID:2 | 282 | X-UID:2 |
283 | 283 | ||
284 | 2 current message | 284 | 2 current message |
@@ -316,7 +316,7 @@ uid | |||
316 | headers | 316 | headers |
317 | ]) | 317 | ]) |
318 | 318 | ||
319 | AT_CHECK([mbop -m inbox2 < commands2a], | 319 | AT_CHECK([mbop -m inbox2 < commands2a|x_imapbase_normalize], |
320 | [0], | 320 | [0], |
321 | [count: 3 | 321 | [count: 3 |
322 | 1 current message | 322 | 1 current message |
@@ -327,7 +327,7 @@ From:Alice <alice@wonder.land> | |||
327 | Message-Id:<200207292200.3302@wonder.land> | 327 | Message-Id:<200207292200.3302@wonder.land> |
328 | To:March Hare <hare@wonder.land> | 328 | To:March Hare <hare@wonder.land> |
329 | Subject:Re: Invitation | 329 | Subject:Re: Invitation |
330 | X-IMAPbase:10 9 | 330 | X-IMAPbase:10 9 |
331 | X-UID:2 | 331 | X-UID:2 |
332 | 332 | ||
333 | 2 current message | 333 | 2 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 | ||
5 | PATH=@abs_builddir@:@abs_top_builddir@/testsuite:$PATH | 5 | PATH=@abs_builddir@:@abs_top_builddir@/testsuite:$PATH |
6 | spooldir=$abs_top_srcdir/testsuite/spool/ | 6 | spooldir=$abs_top_srcdir/testsuite/spool/ |
7 | x_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 | |||
150 | headers | 150 | headers |
151 | ]) | 151 | ]) |
152 | 152 | ||
153 | AT_CHECK([mbop -m inbox1 < commands1], | 153 | AT_CHECK([mbop -m inbox1 < commands1|x_imapbase_normalize], |
154 | [0], | 154 | [0], |
155 | [1 current message | 155 | [1 current message |
156 | 1 set_deleted: OK | 156 | 1 set_deleted: OK |
@@ -168,7 +168,7 @@ From:March Hare <hare@wonder.land> | |||
168 | Message-Id:<200207292200.3303@wonder.land> | 168 | Message-Id:<200207292200.3303@wonder.land> |
169 | To:Alice <alice@wonder.land> | 169 | To:Alice <alice@wonder.land> |
170 | Subject:Re: Invitation | 170 | Subject:Re: Invitation |
171 | X-IMAPbase:10 9 | 171 | X-IMAPbase:10 9 |
172 | X-UID:3 | 172 | X-UID:3 |
173 | 173 | ||
174 | 2 current message | 174 | 2 current message |
@@ -207,7 +207,7 @@ uid | |||
207 | headers | 207 | headers |
208 | ]) | 208 | ]) |
209 | 209 | ||
210 | AT_CHECK([mbop -m inbox1 < commands1a], | 210 | AT_CHECK([mbop -m inbox1 < commands1a|x_imapbase_normalize], |
211 | [0], | 211 | [0], |
212 | [count: 3 | 212 | [count: 3 |
213 | 1 current message | 213 | 1 current message |
@@ -218,7 +218,7 @@ From:March Hare <hare@wonder.land> | |||
218 | Message-Id:<200207292200.3303@wonder.land> | 218 | Message-Id:<200207292200.3303@wonder.land> |
219 | To:Alice <alice@wonder.land> | 219 | To:Alice <alice@wonder.land> |
220 | Subject:Re: Invitation | 220 | Subject:Re: Invitation |
221 | X-IMAPbase:10 9 | 221 | X-IMAPbase:10 9 |
222 | X-UID:3 | 222 | X-UID:3 |
223 | 223 | ||
224 | 2 current message | 224 | 2 current message |
@@ -264,7 +264,7 @@ uid | |||
264 | headers | 264 | headers |
265 | ]) | 265 | ]) |
266 | 266 | ||
267 | AT_CHECK([mbop -m inbox2 < commands2], | 267 | AT_CHECK([mbop -m inbox2 < commands2|x_imapbase_normalize], |
268 | [0], | 268 | [0], |
269 | [1 current message | 269 | [1 current message |
270 | 1 set_deleted: OK | 270 | 1 set_deleted: OK |
@@ -282,7 +282,7 @@ From:Alice <alice@wonder.land> | |||
282 | Message-Id:<200207292200.3302@wonder.land> | 282 | Message-Id:<200207292200.3302@wonder.land> |
283 | To:March Hare <hare@wonder.land> | 283 | To:March Hare <hare@wonder.land> |
284 | Subject:Re: Invitation | 284 | Subject:Re: Invitation |
285 | X-IMAPbase:10 9 | 285 | X-IMAPbase:10 9 |
286 | X-UID:2 | 286 | X-UID:2 |
287 | 287 | ||
288 | 2 current message | 288 | 2 current message |
@@ -320,7 +320,7 @@ uid | |||
320 | headers | 320 | headers |
321 | ]) | 321 | ]) |
322 | 322 | ||
323 | AT_CHECK([mbop -m inbox2 < commands2a], | 323 | AT_CHECK([mbop -m inbox2 < commands2a|x_imapbase_normalize], |
324 | [0], | 324 | [0], |
325 | [count: 3 | 325 | [count: 3 |
326 | 1 current message | 326 | 1 current message |
@@ -331,7 +331,7 @@ From:Alice <alice@wonder.land> | |||
331 | Message-Id:<200207292200.3302@wonder.land> | 331 | Message-Id:<200207292200.3302@wonder.land> |
332 | To:March Hare <hare@wonder.land> | 332 | To:March Hare <hare@wonder.land> |
333 | Subject:Re: Invitation | 333 | Subject:Re: Invitation |
334 | X-IMAPbase:10 9 | 334 | X-IMAPbase:10 9 |
335 | X-UID:2 | 335 | X-UID:2 |
336 | 336 | ||
337 | 2 current message | 337 | 2 current message |