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.

5 files changed, 23 insertions, 17 deletions

diff --git a/configure.ac b/configure.ac
index 6d6f4bc..f560142 100644
--- a/configure.ac
+++ b/configure.ac
@@ -994,7 +994,7 @@ fi
 
 
 # Mailbox quota support
-AM_CONDITIONAL([MU_COND_MAILBOX_QUOTA],[test -n "$status_dbm$status_mysql"])
+AM_CONDITIONAL([MU_COND_MAILBOX_QUOTA],[test "$status_dbm$status_mysql" != "nono"])
 
 
 # Virtual domain support
diff --git a/libproto/dotmail/tests/atlocal.in b/libproto/dotmail/tests/atlocal.in
index d591631..a6b4026 100644
--- a/libproto/dotmail/tests/atlocal.in
+++ b/libproto/dotmail/tests/atlocal.in
@@ -3,3 +3,6 @@
 # Copyright (C) 2004-2021 Free Software Foundation, Inc.
 
 PATH=@abs_builddir@:@abs_builddir@/..:$top_srcdir:$srcdir:$PATH
+x_imapbase_normalize() {
+        sed -e '/^X-IMAPbase:/s/  */ /g'
+}
diff --git a/libproto/dotmail/tests/delete.at b/libproto/dotmail/tests/delete.at
index 3254978..446136b 100644
--- a/libproto/dotmail/tests/delete.at
+++ b/libproto/dotmail/tests/delete.at
@@ -146,7 +146,7 @@ uid
 headers
 ])
 
-AT_CHECK([mbop -m inbox1 < commands1],
+AT_CHECK([mbop -m inbox1 < commands1|x_imapbase_normalize],
 [0],
 [1 current message
 1 set_deleted: OK
@@ -164,7 +164,7 @@ From:March Hare  <hare@wonder.land>
 Message-Id:<200207292200.3303@wonder.land>
 To:Alice  <alice@wonder.land>
 Subject:Re: Invitation
-X-IMAPbase:10                    9
+X-IMAPbase:10 9
 X-UID:3
 
 2 current message
@@ -203,7 +203,7 @@ uid
 headers
 ])
 
-AT_CHECK([mbop -m inbox1 < commands1a],
+AT_CHECK([mbop -m inbox1 < commands1a|x_imapbase_normalize],
 [0],
 [count: 3
 1 current message
@@ -214,7 +214,7 @@ From:March Hare  <hare@wonder.land>
 Message-Id:<200207292200.3303@wonder.land>
 To:Alice  <alice@wonder.land>
 Subject:Re: Invitation
-X-IMAPbase:10                    9
+X-IMAPbase:10 9
 X-UID:3
 
 2 current message
@@ -260,7 +260,7 @@ uid
 headers
 ])
 
-AT_CHECK([mbop -m inbox2 < commands2],
+AT_CHECK([mbop -m inbox2 < commands2|x_imapbase_normalize],
 [0],
 [1 current message
 1 set_deleted: OK
@@ -278,7 +278,7 @@ From:Alice  <alice@wonder.land>
 Message-Id:<200207292200.3302@wonder.land>
 To:March Hare  <hare@wonder.land>
 Subject:Re: Invitation
-X-IMAPbase:10                    9
+X-IMAPbase:10 9
 X-UID:2
 
 2 current message
@@ -316,7 +316,7 @@ uid
 headers
 ])
 
-AT_CHECK([mbop -m inbox2 < commands2a],
+AT_CHECK([mbop -m inbox2 < commands2a|x_imapbase_normalize],
 [0],
 [count: 3
 1 current message
@@ -327,7 +327,7 @@ From:Alice  <alice@wonder.land>
 Message-Id:<200207292200.3302@wonder.land>
 To:March Hare  <hare@wonder.land>
 Subject:Re: Invitation
-X-IMAPbase:10                    9
+X-IMAPbase:10 9
 X-UID:2
 
 2 current message
diff --git a/libproto/mbox/tests/atlocal.in b/libproto/mbox/tests/atlocal.in
index 8be70d0..2ee4882 100644
--- a/libproto/mbox/tests/atlocal.in
+++ b/libproto/mbox/tests/atlocal.in
@@ -4,3 +4,6 @@
 
 PATH=@abs_builddir@:@abs_top_builddir@/testsuite:$PATH
 spooldir=$abs_top_srcdir/testsuite/spool/
+x_imapbase_normalize() {
+	sed -e '/^X-IMAPbase:/s/  */ /g'
+}
diff --git a/libproto/mbox/tests/delete.at b/libproto/mbox/tests/delete.at
index 8a5d97b..cbec958 100644
--- a/libproto/mbox/tests/delete.at
+++ b/libproto/mbox/tests/delete.at
@@ -150,7 +150,7 @@ uid
 headers
 ])
 
-AT_CHECK([mbop -m inbox1 < commands1],
+AT_CHECK([mbop -m inbox1 < commands1|x_imapbase_normalize],
 [0],
 [1 current message
 1 set_deleted: OK
@@ -168,7 +168,7 @@ From:March Hare  <hare@wonder.land>
 Message-Id:<200207292200.3303@wonder.land>
 To:Alice  <alice@wonder.land>
 Subject:Re: Invitation
-X-IMAPbase:10                    9
+X-IMAPbase:10 9
 X-UID:3
 
 2 current message
@@ -207,7 +207,7 @@ uid
 headers
 ])
 
-AT_CHECK([mbop -m inbox1 < commands1a],
+AT_CHECK([mbop -m inbox1 < commands1a|x_imapbase_normalize],
 [0],
 [count: 3
 1 current message
@@ -218,7 +218,7 @@ From:March Hare  <hare@wonder.land>
 Message-Id:<200207292200.3303@wonder.land>
 To:Alice  <alice@wonder.land>
 Subject:Re: Invitation
-X-IMAPbase:10                    9
+X-IMAPbase:10 9
 X-UID:3
 
 2 current message
@@ -264,7 +264,7 @@ uid
 headers
 ])
 
-AT_CHECK([mbop -m inbox2 < commands2],
+AT_CHECK([mbop -m inbox2 < commands2|x_imapbase_normalize],
 [0],
 [1 current message
 1 set_deleted: OK
@@ -282,7 +282,7 @@ From:Alice  <alice@wonder.land>
 Message-Id:<200207292200.3302@wonder.land>
 To:March Hare  <hare@wonder.land>
 Subject:Re: Invitation
-X-IMAPbase:10                    9
+X-IMAPbase:10 9
 X-UID:2
 
 2 current message
@@ -320,7 +320,7 @@ uid
 headers
 ])
 
-AT_CHECK([mbop -m inbox2 < commands2a],
+AT_CHECK([mbop -m inbox2 < commands2a|x_imapbase_normalize],
 [0],
 [count: 3
 1 current message
@@ -331,7 +331,7 @@ From:Alice  <alice@wonder.land>
 Message-Id:<200207292200.3302@wonder.land>
 To:March Hare  <hare@wonder.land>
 Subject:Re: Invitation
-X-IMAPbase:10                    9
+X-IMAPbase:10 9
 X-UID:2
 
 2 current message