Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit e57318e7 e57318e7d47f944c420e6bfd931b44185d776cfc by Sergey Poznyakoff
Options

Fix make check if MU_DEFAULT_SCHEME value is other than mbox 

* testsuite/testsuite.inc (MUT_DEFAULT_OPTIONS): New define.
* maidag/tests/testsuite.at: Add MUT_DEFAULT_OPTIONS to the
options passed to maidag
* mail/tests/cols00.at: Use MUT_MAIL_CMD
* mail/tests/cols01.at: Likewise.
* mail/tests/copy00.at: Likewise.
* mail/tests/nohome.at: Likewise.
* mail/tests/testsuite.at (MUT_MAIL_CMD): New define.  Pass
MUT_DEFAULT_OPTIONS to mail.
* sieve/tests/testsuite.at: Pass MUT_DEFAULT_OPTIONS to sieve.
1 parent 2c419ba0
Inline Side-by-side
Showing 8 changed files with 19 additions and 12 deletions
...@@ -17,8 +17,7 @@ ...@@ -17,8 +17,7 @@
17 m4_include([testsuite.inc]) 17 m4_include([testsuite.inc])
18 18
19 m4_define([MAIDAG_OPTIONS],[dnl 19 m4_define([MAIDAG_OPTIONS],[dnl
20 --no-site-config dnl 20 MUT_DEFAULT_OPTIONS dnl
21 --no-user-config dnl
22 --set '|mailbox|mailbox-pattern='`pwd`/spool/'${user}' dnl 21 --set '|mailbox|mailbox-pattern='`pwd`/spool/'${user}' dnl
23 --set .auth.authorization=system dnl 22 --set .auth.authorization=system dnl
24 --stderr]) 23 --stderr])
......
...@@ -25,8 +25,8 @@ AT_KEYWORDS([columns cols00]) ...@@ -25,8 +25,8 @@ AT_KEYWORDS([columns cols00])
25 AT_CHECK([ 25 AT_CHECK([
26 MUT_MBCOPY($abs_top_srcdir/testsuite/spool/mbox) 26 MUT_MBCOPY($abs_top_srcdir/testsuite/spool/mbox)
27 unset MAILRC 27 unset MAILRC
28 COLUMNS=26 mail -nH -E 'set columns=26' -f ./mbox 28 COLUMNS=26 MUT_MAIL_CMD -nH -E 'set columns=26' -f ./mbox
29 COLUMNS=31 mail -nH -f ./mbox 29 COLUMNS=31 MUT_MAIL_CMD -nH -f ./mbox
30 ], 30 ],
31 [0], 31 [0],
32 [>N 1 Sergey Poznyakoff 32 [>N 1 Sergey Poznyakoff
......
...@@ -25,8 +25,8 @@ AT_KEYWORDS([columns cols01]) ...@@ -25,8 +25,8 @@ AT_KEYWORDS([columns cols01])
25 AT_CHECK([ 25 AT_CHECK([
26 MUT_MBCOPY($abs_top_srcdir/testsuite/spool/mbox) 26 MUT_MBCOPY($abs_top_srcdir/testsuite/spool/mbox)
27 unset MAILRC 27 unset MAILRC
28 mail -nH -E 'set columns=26' -f ./mbox 28 MUT_MAIL_CMD -nH -E 'set columns=26' -f ./mbox
29 mail -nH -E 'set columns=31' -f ./mbox 29 MUT_MAIL_CMD -nH -E 'set columns=31' -f ./mbox
30 ], 30 ],
31 [0], 31 [0],
32 [>N 1 Sergey Poznyakoff 32 [>N 1 Sergey Poznyakoff
......
...@@ -26,7 +26,7 @@ AT_CHECK([ ...@@ -26,7 +26,7 @@ AT_CHECK([
26 test -f /dev/stdout || AT_SKIP_TEST 26 test -f /dev/stdout || AT_SKIP_TEST
27 MUT_MBCOPY($abs_top_srcdir/testsuite/spool/mbox) 27 MUT_MBCOPY($abs_top_srcdir/testsuite/spool/mbox)
28 unset MAILRC 28 unset MAILRC
29 echo 'copy 1 /dev/stdout' | mail -N -E 'set readonly' -f ./mbox | sed 's/ *$//;/^Held 1 message/d'; 29 echo 'copy 1 /dev/stdout' | MUT_MAIL_CMD -N -E 'set readonly' -f ./mbox | sed 's/ *$//;/^Held 1 message/d';
30 ], 30 ],
31 [0], 31 [0],
32 [From gray@example.net Tue Jul 16 12:11:35 2002 32 [From gray@example.net Tue Jul 16 12:11:35 2002
......
...@@ -26,7 +26,7 @@ AT_CHECK([ ...@@ -26,7 +26,7 @@ AT_CHECK([
26 MUT_MBCOPY($abs_top_srcdir/testsuite/spool/mbox) 26 MUT_MBCOPY($abs_top_srcdir/testsuite/spool/mbox)
27 unset MAILRC 27 unset MAILRC
28 unset HOME 28 unset HOME
29 MAIL=./mbox mail -nH 29 MAIL=./mbox MUT_MAIL_CMD -nH
30 ], 30 ],
31 [0], 31 [0],
32 [>N 1 Sergey Poznyakoff Tue Jul 16 12:11 12/390 MBOX 32 [>N 1 Sergey Poznyakoff Tue Jul 16 12:11 12/390 MBOX
......
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
16 16
17 m4_include([testsuite.inc]) 17 m4_include([testsuite.inc])
18 18
19 m4_define([MUT_MAIL_CMD],[mail MUT_DEFAULT_OPTIONS])
20
19 AT_INIT 21 AT_INIT
20 AT_TESTED([mail]) 22 AT_TESTED([mail])
21 23
......
...@@ -27,10 +27,7 @@ AT_CLEANUP ...@@ -27,10 +27,7 @@ AT_CLEANUP
27 ]) 27 ])
28 28
29 dnl ------------------------------------------------------------ 29 dnl ------------------------------------------------------------
30 m4_define([MUT_SIEVE_DEFAULT_OPTIONS],[dnl 30 m4_define([MUT_SIEVE_DEFAULT_OPTIONS],MUT_DEFAULT_OPTIONS)
31 --no-site-config dnl
32 --no-user-config dnl
33 ])
34 31
35 dnl ------------------------------------------------------------ 32 dnl ------------------------------------------------------------
36 dnl MUT_SIEVE_OPTIONS -- additional command line options for Sieve 33 dnl MUT_SIEVE_OPTIONS -- additional command line options for Sieve
......
...@@ -21,6 +21,15 @@ m4_version_prereq([2.52g]) ...@@ -21,6 +21,15 @@ m4_version_prereq([2.52g])
21 m4_define([AT_SKIP_TEST],[exit 77]) 21 m4_define([AT_SKIP_TEST],[exit 77])
22 22
23 dnl ------------------------------------------------------------ 23 dnl ------------------------------------------------------------
24 dnl MUT_DEFAULT_OPTIONS -- produce default command line options
25 dnl ------------------------------------------------------------
26 m4_define([MUT_DEFAULT_OPTIONS],[dnl
27 --no-site-config dnl
28 --no-user-config dnl
29 --set '.mailbox.mailbox-type=mbox' dnl
30 ])
31
32 dnl ------------------------------------------------------------
24 dnl MUT_VERSION(TOOL) -- checks the version output from TOOL 33 dnl MUT_VERSION(TOOL) -- checks the version output from TOOL
25 dnl 34 dnl
26 m4_define([MUT_VERSION],[ 35 m4_define([MUT_VERSION],[
......