summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2020-11-29 19:53:57 +0200
committerSergey Poznyakoff <gray@gnu.org>2020-11-29 20:10:52 +0200
commitb28243aff348d58cd27a1f8e8fa066149537a2d0 (patch)
tree2e66f06ec76a0f573a25b53d9b042252256c74ff
parent4eb3d0724550303cc27867112a167df7534ccb70 (diff)
downloadmailutils-b28243aff348d58cd27a1f8e8fa066149537a2d0.tar.gz
mailutils-b28243aff348d58cd27a1f8e8fa066149537a2d0.tar.bz2
Avoid using VPATH in libproto testsuites
* libproto/dotmail/tests/Makefile.am: Build mbop from local source. * libproto/maildir/tests/Makefile.am: Likewise. * libproto/mbox/tests/Makefile.am: Likewise. * libproto/mh/tests/Makefile.am: Likewise. * libproto/dotmail/tests/mbop.c: New file. * libproto/maildir/tests/mbop.c: New file. * libproto/mbox/tests/mbop.c: New file. * libproto/mh/tests/mbop.c: New file. Rename mbox.c files in libproto libraries to avoid confusion with the eponymous format. * libproto/imap/mbox.c: Rename to mailbox.c. * libproto/imap/Makefile.am: Update. * libproto/maildir/mbox.c: Rename to maildir.c * libproto/maildir/Makefile.am: Update. * libproto/mailer/mbox.c: Rename to mailbox.c * libproto/mailer/Makefile.am: Update. * libproto/mh/mbox.c: Rename to mh.c. * libproto/mh/Makefile.am: Update. * libproto/pop/mbox.c: Rename to mailbox.c * libproto/pop/Makefile.am: Update.
-rw-r--r--libproto/dotmail/tests/Makefile.am8
-rw-r--r--libproto/dotmail/tests/mbop.c3
-rw-r--r--libproto/imap/Makefile.am2
-rw-r--r--libproto/imap/mailbox.c (renamed from libproto/imap/mbox.c)0
-rw-r--r--libproto/maildir/Makefile.am2
-rw-r--r--libproto/maildir/maildir.c (renamed from libproto/maildir/mbox.c)0
-rw-r--r--libproto/maildir/tests/Makefile.am9
-rw-r--r--libproto/maildir/tests/mbop.c3
-rw-r--r--libproto/mailer/Makefile.am2
-rw-r--r--libproto/mailer/mailbox.c (renamed from libproto/mailer/mbox.c)0
-rw-r--r--libproto/mbox/tests/Makefile.am8
-rw-r--r--libproto/mbox/tests/mbop.c3
-rw-r--r--libproto/mh/Makefile.am2
-rw-r--r--libproto/mh/mh.c (renamed from libproto/mh/mbox.c)0
-rw-r--r--libproto/mh/tests/Makefile.am9
-rw-r--r--libproto/mh/tests/mbop.c3
-rw-r--r--libproto/pop/Makefile.am2
-rw-r--r--libproto/pop/mailbox.c (renamed from libproto/pop/mbox.c)0
18 files changed, 27 insertions, 29 deletions
diff --git a/libproto/dotmail/tests/Makefile.am b/libproto/dotmail/tests/Makefile.am
index 8df22787e..944f320e2 100644
--- a/libproto/dotmail/tests/Makefile.am
+++ b/libproto/dotmail/tests/Makefile.am
@@ -22,17 +22,13 @@ include $(top_srcdir)/testsuite/testsuite.am
AM_CPPFLAGS = \
$(MU_LIB_COMMON_INCLUDES)\
- -I$(top_srcdir)/libmailutils/tests\
- -DMBOP_RECORD=mu_dotmail_record \
- -DMBOP_SCHEME=\"dotmail\"
+ -I$(top_srcdir)\
+ -I$(top_srcdir)/libmailutils/tests
noinst_PROGRAMS = \
mbop
LDADD = -L$(top_builddir)/libmailutils/tests -lmu_tesh $(MU_LIB_DOTMAIL) $(MU_LIB_MAILUTILS)
-VPATH += $(top_srcdir)/testsuite
-nodist_mbop_SOURCES = mbop.c
-
## ------------ ##
## Test suite. ##
## ------------ ##
diff --git a/libproto/dotmail/tests/mbop.c b/libproto/dotmail/tests/mbop.c
new file mode 100644
index 000000000..aacedaa02
--- /dev/null
+++ b/libproto/dotmail/tests/mbop.c
@@ -0,0 +1,3 @@
+#define MBOP_RECORD mu_dotmail_record
+#define MBOP_SCHEME "dotmail"
+#include "testsuite/mbop.c"
diff --git a/libproto/imap/Makefile.am b/libproto/imap/Makefile.am
index 567f41dfa..d424e7297 100644
--- a/libproto/imap/Makefile.am
+++ b/libproto/imap/Makefile.am
@@ -67,5 +67,5 @@ libmu_imap_la_SOURCES = \
unselect.c\
unsubscribe.c\
folder.c\
- mbox.c\
+ mailbox.c\
url.c
diff --git a/libproto/imap/mbox.c b/libproto/imap/mailbox.c
index c5eaf68cb..c5eaf68cb 100644
--- a/libproto/imap/mbox.c
+++ b/libproto/imap/mailbox.c
diff --git a/libproto/maildir/Makefile.am b/libproto/maildir/Makefile.am
index 66c529f5c..716558389 100644
--- a/libproto/maildir/Makefile.am
+++ b/libproto/maildir/Makefile.am
@@ -22,7 +22,7 @@ libmu_maildir_la_LIBADD = $(MU_LIB_MAILUTILS)
libmu_maildir_la_SOURCES = \
folder.c \
maildir.h \
- mbox.c
+ maildir.c
SUBDIRS = . tests
diff --git a/libproto/maildir/mbox.c b/libproto/maildir/maildir.c
index ec0c54b06..ec0c54b06 100644
--- a/libproto/maildir/mbox.c
+++ b/libproto/maildir/maildir.c
diff --git a/libproto/maildir/tests/Makefile.am b/libproto/maildir/tests/Makefile.am
index 320b2897c..2aea77ac7 100644
--- a/libproto/maildir/tests/Makefile.am
+++ b/libproto/maildir/tests/Makefile.am
@@ -22,17 +22,14 @@ include $(top_srcdir)/testsuite/testsuite.am
AM_CPPFLAGS = \
$(MU_LIB_COMMON_INCLUDES) \
- -I$(top_srcdir)/libmailutils/tests \
- -DMBOP_RECORD=mu_maildir_record \
- -DMBOP_SCHEME=\"maildir\"
+ -I$(top_srcdir)\
+ -I$(top_srcdir)/libmailutils/tests
+
noinst_PROGRAMS = \
mbop
LDADD = -L$(top_builddir)/libmailutils/tests -lmu_tesh $(MU_LIB_MAILDIR) $(MU_LIB_MAILUTILS)
-VPATH += $(top_srcdir)/testsuite
-nodist_mbop_SOURCES = mbop.c
-
## ------------ ##
## Test suite. ##
## ------------ ##
diff --git a/libproto/maildir/tests/mbop.c b/libproto/maildir/tests/mbop.c
new file mode 100644
index 000000000..9f87c32bf
--- /dev/null
+++ b/libproto/maildir/tests/mbop.c
@@ -0,0 +1,3 @@
+#define MBOP_RECORD mu_maildir_record
+#define MBOP_SCHEME "maildir"
+#include "testsuite/mbop.c"
diff --git a/libproto/mailer/Makefile.am b/libproto/mailer/Makefile.am
index 05da8b299..a2c048ffe 100644
--- a/libproto/mailer/Makefile.am
+++ b/libproto/mailer/Makefile.am
@@ -26,7 +26,7 @@ endif
EXTRA_DIST=smtp_gsasl.c
libmu_mailer_la_SOURCES = \
- mbox.c\
+ mailbox.c\
prog.c\
sendmail.c\
smtp.c\
diff --git a/libproto/mailer/mbox.c b/libproto/mailer/mailbox.c
index a2df7239e..a2df7239e 100644
--- a/libproto/mailer/mbox.c
+++ b/libproto/mailer/mailbox.c
diff --git a/libproto/mbox/tests/Makefile.am b/libproto/mbox/tests/Makefile.am
index 986ece0ff..1629e31e1 100644
--- a/libproto/mbox/tests/Makefile.am
+++ b/libproto/mbox/tests/Makefile.am
@@ -22,17 +22,13 @@ include $(top_srcdir)/testsuite/testsuite.am
AM_CPPFLAGS = \
$(MU_LIB_COMMON_INCLUDES)\
- -I$(top_srcdir)/libmailutils/tests\
- -DMBOP_RECORD=mu_mbox_record \
- -DMBOP_SCHEME=\"mbox\"
+ -I$(top_srcdir)\
+ -I$(top_srcdir)/libmailutils/tests
noinst_PROGRAMS = \
mbop
LDADD = -L$(top_builddir)/libmailutils/tests -lmu_tesh $(MU_LIB_MBOX) $(MU_LIB_MAILUTILS)
-VPATH += $(top_srcdir)/testsuite
-nodist_mbop_SOURCES = mbop.c
-
## ------------ ##
## Test suite. ##
## ------------ ##
diff --git a/libproto/mbox/tests/mbop.c b/libproto/mbox/tests/mbop.c
new file mode 100644
index 000000000..7074e1e33
--- /dev/null
+++ b/libproto/mbox/tests/mbop.c
@@ -0,0 +1,3 @@
+#define MBOP_RECORD mu_mbox_record
+#define MBOP_SCHEME "mbox"
+#include "testsuite/mbop.c"
diff --git a/libproto/mh/Makefile.am b/libproto/mh/Makefile.am
index 24a4bc996..7234cdeda 100644
--- a/libproto/mh/Makefile.am
+++ b/libproto/mh/Makefile.am
@@ -21,7 +21,7 @@ libmu_mh_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
libmu_mh_la_LIBADD = $(MU_LIB_MAILUTILS)
libmu_mh_la_SOURCES = \
folder.c\
- mbox.c\
+ mh.c\
profile.c
SUBDIRS = . tests
diff --git a/libproto/mh/mbox.c b/libproto/mh/mh.c
index 338ea95f1..338ea95f1 100644
--- a/libproto/mh/mbox.c
+++ b/libproto/mh/mh.c
diff --git a/libproto/mh/tests/Makefile.am b/libproto/mh/tests/Makefile.am
index b1711e568..fae4351e1 100644
--- a/libproto/mh/tests/Makefile.am
+++ b/libproto/mh/tests/Makefile.am
@@ -22,17 +22,14 @@ include $(top_srcdir)/testsuite/testsuite.am
AM_CPPFLAGS = \
$(MU_LIB_COMMON_INCLUDES) \
- -I$(top_srcdir)/libmailutils/tests \
- -DMBOP_RECORD=mu_mh_record \
- -DMBOP_SCHEME=\"mh\"
+ -I$(top_srcdir)\
+ -I$(top_srcdir)/libmailutils/tests
+
noinst_PROGRAMS = \
mbop
LDADD = -L$(top_builddir)/libmailutils/tests -lmu_tesh $(MU_LIB_MH) $(MU_LIB_MAILUTILS)
-VPATH += $(top_srcdir)/testsuite
-nodist_mbop_SOURCES = mbop.c
-
## ------------ ##
## Test suite. ##
## ------------ ##
diff --git a/libproto/mh/tests/mbop.c b/libproto/mh/tests/mbop.c
new file mode 100644
index 000000000..790c72773
--- /dev/null
+++ b/libproto/mh/tests/mbop.c
@@ -0,0 +1,3 @@
+#define MBOP_RECORD mu_mh_record
+#define MBOP_SCHEME "mh"
+#include "testsuite/mbop.c"
diff --git a/libproto/pop/Makefile.am b/libproto/pop/Makefile.am
index d15ee6b86..c020efa09 100644
--- a/libproto/pop/Makefile.am
+++ b/libproto/pop/Makefile.am
@@ -21,7 +21,7 @@ libmu_pop_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
libmu_pop_la_LIBADD = $(MU_LIB_AUTH) $(MU_LIB_MAILUTILS) $(LTLIBINTL)
libmu_pop_la_SOURCES = \
- mbox.c \
+ mailbox.c \
folder.c\
url.c\
\
diff --git a/libproto/pop/mbox.c b/libproto/pop/mailbox.c
index 9fb87c1eb..9fb87c1eb 100644
--- a/libproto/pop/mbox.c
+++ b/libproto/pop/mailbox.c

Return to:

Send suggestions and report system problems to the System administrator.