pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

nmh: add support for the `test' phase



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Mon Aug 7 10:08:43 2017 +0200
Changeset:	c08eff831b03d4d859ae5b7089e5124b9e098ba3

Modified Files:
	nmh/Makefile
	nmh/distinfo
	nmh/patches/patch-ca

Log Message:
nmh: add support for the `test' phase

Add support for nmh tests. Modify patches/patch-ca accordingly in order to
adjust TEST_ENVIRONMENT to use the configuration files in $egdir instead of the
ones in $nmhetcdir.
Actually all tests are passed except an mhparam test that sposts the
$egdir/$nmetcdir kludge.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c08eff831b03d4d859ae5b7089e5124b9e098ba3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 nmh/Makefile         |  2 ++
 nmh/distinfo         |  2 +-
 nmh/patches/patch-ca | 16 +++++++++++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diffs:
diff --git a/nmh/Makefile b/nmh/Makefile
index f8a5e74adb..3609bad450 100644
--- a/nmh/Makefile
+++ b/nmh/Makefile
@@ -90,6 +90,8 @@ CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 CONFIGURE_ENV+=		ac_cv_func_arc4random=no
 .endif
 
+TEST_TARGET=		check
+
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/mhn.defaults.dist \
 	    ${DESTDIR}${EGDIR}/mhn.defaults
diff --git a/nmh/distinfo b/nmh/distinfo
index 5cbc1f1851..f4a7ce764e 100644
--- a/nmh/distinfo
+++ b/nmh/distinfo
@@ -4,5 +4,5 @@ SHA1 (nmh-1.7-RC1.tar.gz) = 1e5d3d139d2771f61347be88737118e63a6f860d
 RMD160 (nmh-1.7-RC1.tar.gz) = f005591180c2ae8e177ed2d3baa24b6066bb14b9
 SHA512 (nmh-1.7-RC1.tar.gz) = 533ebc81ebf9070bfc754dc38d97600f18a50f23999b938348535bb5923b349ed6e3900477d15ebc4c252ca3993cc7a71af4522fdd7f52249e14d3875c1dedca
 Size (nmh-1.7-RC1.tar.gz) = 1386731 bytes
-SHA1 (patch-ca) = ffca01a1f713b565cce5f6d5b55f280902090216
+SHA1 (patch-ca) = 809928b0de6f72f8c3d348936635c57a62e6ed63
 SHA1 (patch-cd) = 5a775091713bca2597a01fcd267d56e2a175588a
diff --git a/nmh/patches/patch-ca b/nmh/patches/patch-ca
index 2115c4fedd..177a485ae5 100644
--- a/nmh/patches/patch-ca
+++ b/nmh/patches/patch-ca
@@ -1,6 +1,9 @@
 $NetBSD: patch-ca,v 1.8 2014/09/06 16:07:43 schnoebe Exp $
 
-install config files into share/examples
+- Introduce $egdir and install all configuration files in it, in order to
+  properly use CONF_FILES to manage configuration files for pkgsrc.
+- Adjust TEST_ENVIRONMENT in order to use $egdir instead of $nmhetcdir
+  because $nmhetcdir is not available in `test' phase.
 
 --- Makefile.in.orig	2017-08-03 02:22:59.000000000 +0000
 +++ Makefile.in
@@ -12,6 +15,17 @@ install config files into share/examples
  target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
+@@ -881,8 +882,8 @@ TESTS_ENVIRONMENT = MH_OBJ_DIR="@abs_bui
+ 		    CURL_USER_AGENT='@CURL_USER_AGENT@' \
+ 		    MH_TEST_DIR=`cd "@abs_builddir@" && pwd -P`/test/testdir \
+ 		    nmhlibexecdir="$(nmhlibexecdir)" bindir="$(bindir)" \
+-		    mandir="$(mandir)" nmhetcdir="$(nmhetcdir)" \
+-		    nmhetcdirinst="@nmhetcdirinst@$(nmhetcdir)" \
++		    mandir="$(mandir)" nmhetcdir="$(egdir)" \
++		    nmhetcdirinst="@nmhetcdirinst@$(egdir)" \
+ 		    supported_locks="$(supported_locks)" \
+ 		    default_locking="${default_locking}" \
+ 		    MULTIBYTE_ENABLED=$(MULTIBYTE_ENABLED) \
 @@ -4625,46 +4626,46 @@ uninstall-dist_docs_contribDATA:
  	dir='$(DESTDIR)$(docs_contribdir)'; $(am__uninstall_files_from_dir)
  install-dist_nmhetcDATA: $(dist_nmhetc_DATA)


Home | Main Index | Thread Index | Old Index