summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2008-03-09 22:03:48 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2008-03-09 22:03:48 (GMT)
commit9fe06f87591f813fce7f9068f19246c8d933fc6a (patch) (side-by-side diff)
tree8fe82e694feb735dcc2059bc154c2d40c02ff70a
parent67f891b804218ca7b42318fadeedfeec9243a0d6 (diff)
downloadmailfromd-9fe06f87591f813fce7f9068f19246c8d933fc6a.tar.gz
mailfromd-9fe06f87591f813fce7f9068f19246c8d933fc6a.tar.bz2
Fix the test suite. The file status.mfh now contains m4 statements,
yet the test suite uses --no-preproc files, so we have to use an already preprocessed version of that file. * tests/atlocal.in (MFOPTS): Add -I@abs_builddir@ * tests/Makefile.am (status.mfh): New rule. (check_local): Depend on status.mfh (clean-local): Remove status.mfh * NEWS: Raise version number. git-svn-id: file:///svnroot/mailfromd/branches/release_4_3_patches@1629 7a8a7f39-df28-0410-adc6-e0d955640f24
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog10
-rw-r--r--NEWS5
-rw-r--r--tests/Makefile.am9
-rw-r--r--tests/atlocal.in2
4 files changed, 22 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 66cdf70..239eda1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2008-03-09 Sergey Poznyakoff <gray@gnu.org.ua>
+ Fix the test suite. The file status.mfh now contains m4 statements,
+ yet the test suite uses --no-preproc files, so we have to use an
+ already preprocessed version of that file.
+
+ * tests/atlocal.in (MFOPTS): Add -I@abs_builddir@
+ * tests/Makefile.am (status.mfh): New rule.
+ (check_local): Depend on status.mfh
+ (clean-local): Remove status.mfh
+ * NEWS: Raise version number.
+
Prefix all exception codes with `e_'.
* src/mfstat.awk: Look for mf_exception_code/mf_exception_count.
diff --git a/NEWS b/NEWS
index 368e158..25ba9d4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,13 @@
-Mailfromd NEWS -- history of user-visible changes. 2008-03-01
+Mailfromd NEWS -- history of user-visible changes. 2008-03-09
Copyright (C) 2005, 2006, 2007, 2008 Sergey Poznyakoff
See the end of file for copying conditions.
Please send mailfromd bug reports to <bug-mailfromd@gnu.org.ua>
+Version 4.3.90 (SVN)
+
+
Version 4.3.1, 2008-03-01
* Fix program evaluator bug that manifested itself on machines where
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9976c0c..b81f9ac 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -97,19 +97,24 @@ TESTSUITE_AT = \
version.at
TESTSUITE = $(srcdir)/testsuite
+M4=m4
AUTOTEST = $(AUTOM4TE) --language=autotest
$(TESTSUITE): package.m4 $(TESTSUITE_AT)
$(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp
mv $@.tmp $@
-atconfig: $(top_builddir)/config.status
+status.mfh: $(top_srcdir)/src/status.mfh
+ $(M4) $(top_srcdir)/mflib/pp-setup $(top_srcdir)/src/status.mfh > status.mfh
+
+atconfig: $(top_builddir)/config.status
cd $(top_builddir) && ./config.status tests/$@
clean-local:
test ! -f $(TESTSUITE) || $(SHELL) $(TESTSUITE) --clean
+ test -f status.mfh && rm status.mfh
-check-local: atconfig atlocal $(TESTSUITE)
+check-local: atconfig atlocal $(TESTSUITE) status.mfh
$(SHELL) $(TESTSUITE)
# Run the test suite on the *installed* tree.
diff --git a/tests/atlocal.in b/tests/atlocal.in
index 6e19f90..b29c91a 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -22,7 +22,7 @@ cleanup() {
trap "cleanup; test -r $XFAILFILE && cat $XFAILFILE; exit $?" 1 2 13 15
-MFOPTS="-I@abs_builddir@/etc -I@abs_top_srcdir@/tests/etc -I@abs_top_srcdir@/src -I@abs_top_srcdir@/mflib --no-preprocess --no-site-rcfile --no-user-rcfile"
+MFOPTS="-I@abs_builddir@ -I@abs_builddir@/etc -I@abs_top_srcdir@/tests/etc -I@abs_top_srcdir@/src -I@abs_top_srcdir@/mflib --no-preprocess --no-site-rcfile --no-user-rcfile"
ETCDIR=@abs_top_srcdir@/tests/etc
PORT="unix:$STATEDIR/socket"

Return to:

Send suggestions and report system problems to the System administrator.