use TEST_TARGET instead of custom test target

5 files changed, 17 insertions, 27 deletions

diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index edbdf8dd01c..6d9ff23214f 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/02/28 22:15:29 grant Exp $
+# $NetBSD: Makefile,v 1.17 2003/07/12 13:13:46 dillo Exp $
 #
 
 DISTNAME=		libiconv-1.8
@@ -16,6 +16,8 @@ USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE+=	${WRKSRC}/libtool
 LIBTOOL_OVERRIDE+=	${WRKSRC}/libcharset/libtool
 
+TEST_TARGET=		check
+
 # remove any existing charset.alias; if it already exists, libiconv does
 # not overwrite it, and older versions of libiconv wrote incorrect
 # charset.alias files, which were not removed during deinstall since
@@ -27,7 +29,4 @@ pre-install:
 post-install:
 	cd ${WRKSRC}/libcharset/lib && ${MAKE} install-lib
 
-test: build
-	cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} check 2>&1 | tee ${WRKDIR}/check.log
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/glib/Makefile b/devel/glib/Makefile
index ea48c782c84..082d9f5917a 100644
--- a/devel/glib/Makefile
+++ b/devel/glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2003/06/23 09:55:01 seb Exp $
+# $NetBSD: Makefile,v 1.59 2003/07/12 13:17:56 dillo Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp
 #
 
@@ -27,6 +27,8 @@ CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/glib
 INFO_FILES=		glib.info
 USE_NEW_TEXINFO=	YES
 
+TEST_TARGET=		check
+
 PTHREAD_OPTS+=		require
 
 .include "../../mk/bsd.prefs.mk"
@@ -83,9 +85,5 @@ post-configure:
 	done
 .endif
 
-test: build
-	cd ${WRKSRC} &&  ${MAKE_ENV} ${MAKE_PROGRAM} check 2>&1 | \
-		tee ${WRKDIR}/check.log
-
 .include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 39c0802c4c4..5598cce9701 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2003/07/01 16:44:55 drochner Exp $
+# $NetBSD: Makefile,v 1.26 2003/07/12 13:17:57 dillo Exp $
 
 DISTNAME=		glib-2.2.2
 PKGNAME=		${DISTNAME:S/glib/glib2/}
@@ -31,9 +31,7 @@ CONFIGURE_ARGS+=	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/glib
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 
-test: build
-	cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} check 2>&1 | \
-		tee ${WRKDIR}/check.log
+TEST_TARGET=		check
 
 .include "../../converters/libiconv/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index 56790c93932..ab4a4e28d1b 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2003/07/10 22:40:31 seb Exp $
+# $NetBSD: Makefile,v 1.48 2003/07/12 13:17:56 dillo Exp $
 
 DISTNAME=	make-3.80
 PKGNAME=	gmake-3.80
@@ -17,6 +17,11 @@ USE_NEW_TEXINFO=	YES
 TEXINFO_REQD=		4.0
 INFO_FILES=		make.info
 
+# NOTE:  the 'test' target requires perl, but since gmake does
+# not otherwise require it, perl is not listed as an explicit
+# dependency
+TEST_TARGET=		check
+
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(GNU_PROGRAM_PREFIX)
@@ -38,13 +43,5 @@ post-install:
 	${LN} -sf ${GNU_PROGRAM_PREFIX}make ${PREFIX}/bin/gmake
 .endif
 
-# NOTE:  the 'test' target requires perl, but since gmake does
-# not otherwise require it, perl is not listed as an explicit
-# dependency
-test: build
-	cd ${WRKSRC} && \
-		${MAKE_ENV} ${MAKE_PROGRAM} check 2>&1 | \
-		tee ${WRKDIR}/tests.log
-
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/pth/Makefile b/devel/pth/Makefile
index 990c5bfda91..bfb30a3309c 100644
--- a/devel/pth/Makefile
+++ b/devel/pth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2003/06/02 01:20:18 jschauma Exp $
+# $NetBSD: Makefile,v 1.58 2003/07/12 13:17:57 dillo Exp $
 #
 
 DISTNAME=		pth-2.0.0
@@ -21,6 +21,8 @@ CONFIGURE_ARGS+=	--with-fdsetsize=1024
 CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config.guess
 CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
 
+TEST_TARGET=		test
+
 # for PLIST
 PTH_MAJOR=		20
 PTH_MINOR=		20
@@ -37,10 +39,6 @@ CONFIGURE_ARGS+=	--enable-syscall-hard
 .  endif
 .endif
 
-test: build
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} test | \
-		tee ${WRKSRC}/test.log
-
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pth/
 	cd ${WRKSRC} && ${INSTALL_DATA} ANNOUNCE AUTHORS COPYING HACKING \