Support running tests.

4 files changed, 33 insertions, 5 deletions

diff --git a/devel/memcached/Makefile b/devel/memcached/Makefile
index 6afef78722d..bc865635751 100644
--- a/devel/memcached/Makefile
+++ b/devel/memcached/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2012/03/09 13:41:30 fhajny Exp $
+# $NetBSD: Makefile,v 1.28 2012/10/03 10:46:47 asau Exp $
 
 DISTNAME=	memcached-1.4.13
 CATEGORIES=	devel
@@ -31,6 +31,8 @@ PKG_GROUPS_VARS+=	MEMCACHED_GROUP
 PKG_USERS_VARS+=	MEMCACHED_USER
 FILES_SUBST+=		MEMCACHED_USER=${MEMCACHED_USER}
 
+TEST_TARGET=		test
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/memcached-tool ${DESTDIR}${PREFIX}/bin
diff --git a/devel/memcached/distinfo b/devel/memcached/distinfo
index 54e96694bb3..3f649004ae2 100644
--- a/devel/memcached/distinfo
+++ b/devel/memcached/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.13 2012/06/08 11:48:04 fhajny Exp $
+$NetBSD: distinfo,v 1.14 2012/10/03 10:46:47 asau Exp $
 
 SHA1 (memcached-1.4.13.tar.gz) = d9a48d222de53a2603fbab6156d48d0e8936ee92
 RMD160 (memcached-1.4.13.tar.gz) = eb2dc6c034594024522c4880c76f8ea90d3b6bc8
 Size (memcached-1.4.13.tar.gz) = 320751 bytes
-SHA1 (patch-Makefile.in) = 1f1b924b47840c7aa3e2a11c03300bbce58629e2
+SHA1 (patch-Makefile.am) = c8e6c2f4c7ce8264c2b4dcad6445248264a8fa9e
+SHA1 (patch-Makefile.in) = ae42902d4901b52d0ff97824884b3ab0f68a904c
 SHA1 (patch-aa) = a888e2d8ff08278514ff081706465a93c19c44a8
 SHA1 (patch-ab) = a870c803752bca12550da73d19ee0e675b5e576d
 SHA1 (patch-configure) = 7f776205954f8a12bf52d97722ce59693f6f5aa6
diff --git a/devel/memcached/patches/patch-Makefile.am b/devel/memcached/patches/patch-Makefile.am
new file mode 100644
index 00000000000..d62f79ce8c2
--- /dev/null
+++ b/devel/memcached/patches/patch-Makefile.am
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.am,v 1.1 2012/10/03 10:46:47 asau Exp $
+
+List test prerequisite.
+
+--- Makefile.am.orig	2012-01-06 18:19:50.000000000 +0000
++++ Makefile.am
+@@ -73,7 +73,7 @@ EXTRA_DIST = doc scripts t memcached.spe
+ 
+ MOSTLYCLEANFILES = *.gcov *.gcno *.gcda *.tcov
+ 
+-test:	memcached-debug sizes testapp
++test:	memcached-debug sizes testapp timedrun
+ 	$(srcdir)/sizes
+ 	$(srcdir)/testapp
+ 	prove $(srcdir)/t
diff --git a/devel/memcached/patches/patch-Makefile.in b/devel/memcached/patches/patch-Makefile.in
index a872616e33d..8d57e6793dd 100644
--- a/devel/memcached/patches/patch-Makefile.in
+++ b/devel/memcached/patches/patch-Makefile.in
@@ -1,8 +1,9 @@
-$NetBSD: patch-Makefile.in,v 1.1 2011/10/03 11:53:11 adam Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2012/10/03 10:46:47 asau Exp $
 
 Don't build programs that won't be installed
+List test prerequisite.
 
---- Makefile.in.orig	2011-09-30 07:58:24.000000000 +0000
+--- Makefile.in.orig	2012-02-02 21:24:19.000000000 +0000
 +++ Makefile.in
 @@ -68,7 +68,7 @@ CONFIG_HEADER = config.h
  CONFIG_CLEAN_FILES =
@@ -13,3 +14,12 @@ Don't build programs that won't be installed
  am__memcached_SOURCES_DIST = memcached.c memcached.h hash.c hash.h \
  	slabs.c slabs.h items.c items.h assoc.c assoc.h thread.c \
  	daemon.c stats.c stats.h util.c util.h trace.h cache.h \
+@@ -1304,7 +1304,7 @@ memcached_dtrace.o: $(memcached_OBJECTS)
+ memcached_debug_dtrace.o: $(memcached_debug_OBJECTS)
+ 	$(DTRACE) $(DTRACEFLAGS) -G -o memcached_debug_dtrace.o -s ${srcdir}/memcached_dtrace.d $(memcached_debug_OBJECTS)
+ 
+-test:	memcached-debug sizes testapp
++test:	memcached-debug sizes testapp timedrun
+ 	$(srcdir)/sizes
+ 	$(srcdir)/testapp
+ 	prove $(srcdir)/t