diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2008-03-09 22:03:48 +0000 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2008-03-09 22:03:48 +0000 |
commit | 9fe06f87591f813fce7f9068f19246c8d933fc6a (patch) | |
tree | 8fe82e694feb735dcc2059bc154c2d40c02ff70a | |
parent | 67f891b804218ca7b42318fadeedfeec9243a0d6 (diff) | |
download | mailfromd-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
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | NEWS | 5 | ||||
-rw-r--r-- | tests/Makefile.am | 9 | ||||
-rw-r--r-- | tests/atlocal.in | 2 |
4 files changed, 22 insertions, 4 deletions
@@ -1,5 +1,15 @@ | |||
1 | 2008-03-09 Sergey Poznyakoff <gray@gnu.org.ua> | 1 | 2008-03-09 Sergey Poznyakoff <gray@gnu.org.ua> |
2 | 2 | ||
3 | Fix the test suite. The file status.mfh now contains m4 statements, | ||
4 | yet the test suite uses --no-preproc files, so we have to use an | ||
5 | already preprocessed version of that file. | ||
6 | |||
7 | * tests/atlocal.in (MFOPTS): Add -I@abs_builddir@ | ||
8 | * tests/Makefile.am (status.mfh): New rule. | ||
9 | (check_local): Depend on status.mfh | ||
10 | (clean-local): Remove status.mfh | ||
11 | * NEWS: Raise version number. | ||
12 | |||
3 | Prefix all exception codes with `e_'. | 13 | Prefix all exception codes with `e_'. |
4 | 14 | ||
5 | * src/mfstat.awk: Look for mf_exception_code/mf_exception_count. | 15 | * src/mfstat.awk: Look for mf_exception_code/mf_exception_count. |
@@ -1,10 +1,13 @@ | |||
1 | Mailfromd NEWS -- history of user-visible changes. 2008-03-01 | 1 | Mailfromd NEWS -- history of user-visible changes. 2008-03-09 |
2 | Copyright (C) 2005, 2006, 2007, 2008 Sergey Poznyakoff | 2 | Copyright (C) 2005, 2006, 2007, 2008 Sergey Poznyakoff |
3 | See the end of file for copying conditions. | 3 | See the end of file for copying conditions. |
4 | 4 | ||
5 | Please send mailfromd bug reports to <bug-mailfromd@gnu.org.ua> | 5 | Please send mailfromd bug reports to <bug-mailfromd@gnu.org.ua> |
6 | 6 | ||
7 | 7 | ||
8 | Version 4.3.90 (SVN) | ||
9 | |||
10 | |||
8 | Version 4.3.1, 2008-03-01 | 11 | Version 4.3.1, 2008-03-01 |
9 | 12 | ||
10 | * Fix program evaluator bug that manifested itself on machines where | 13 | * Fix program evaluator bug that manifested itself on machines where |
diff --git a/tests/Makefile.am b/tests/Makefile.am index 9976c0c9..b81f9ac6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am | |||
@@ -97,19 +97,24 @@ TESTSUITE_AT = \ | |||
97 | version.at | 97 | version.at |
98 | 98 | ||
99 | TESTSUITE = $(srcdir)/testsuite | 99 | TESTSUITE = $(srcdir)/testsuite |
100 | M4=m4 | ||
100 | 101 | ||
101 | AUTOTEST = $(AUTOM4TE) --language=autotest | 102 | AUTOTEST = $(AUTOM4TE) --language=autotest |
102 | $(TESTSUITE): package.m4 $(TESTSUITE_AT) | 103 | $(TESTSUITE): package.m4 $(TESTSUITE_AT) |
103 | $(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp | 104 | $(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp |
104 | mv $@.tmp $@ | 105 | mv $@.tmp $@ |
105 | 106 | ||
106 | atconfig: $(top_builddir)/config.status | 107 | status.mfh: $(top_srcdir)/src/status.mfh |
108 | $(M4) $(top_srcdir)/mflib/pp-setup $(top_srcdir)/src/status.mfh > status.mfh | ||
109 | |||
110 | atconfig: $(top_builddir)/config.status | ||
107 | cd $(top_builddir) && ./config.status tests/$@ | 111 | cd $(top_builddir) && ./config.status tests/$@ |
108 | 112 | ||
109 | clean-local: | 113 | clean-local: |
110 | test ! -f $(TESTSUITE) || $(SHELL) $(TESTSUITE) --clean | 114 | test ! -f $(TESTSUITE) || $(SHELL) $(TESTSUITE) --clean |
115 | test -f status.mfh && rm status.mfh | ||
111 | 116 | ||
112 | check-local: atconfig atlocal $(TESTSUITE) | 117 | check-local: atconfig atlocal $(TESTSUITE) status.mfh |
113 | $(SHELL) $(TESTSUITE) | 118 | $(SHELL) $(TESTSUITE) |
114 | 119 | ||
115 | # Run the test suite on the *installed* tree. | 120 | # Run the test suite on the *installed* tree. |
diff --git a/tests/atlocal.in b/tests/atlocal.in index 6e19f90a..b29c91a8 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in | |||
@@ -22,7 +22,7 @@ cleanup() { | |||
22 | 22 | ||
23 | trap "cleanup; test -r $XFAILFILE && cat $XFAILFILE; exit $?" 1 2 13 15 | 23 | trap "cleanup; test -r $XFAILFILE && cat $XFAILFILE; exit $?" 1 2 13 15 |
24 | 24 | ||
25 | 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" | 25 | 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" |
26 | ETCDIR=@abs_top_srcdir@/tests/etc | 26 | ETCDIR=@abs_top_srcdir@/tests/etc |
27 | 27 | ||
28 | PORT="unix:$STATEDIR/socket" | 28 | PORT="unix:$STATEDIR/socket" |