From 826c760e5dd6ddcc1943de3c89be60af07a8facf Mon Sep 17 00:00:00 2001
From: pgoyette <pgoyette@NetBSD.org>
Date: Sun, 2 Dec 2012 17:36:10 +0000
Subject: [PATCH] Helper programs are programs, not tests, so build them
 appropriately.

Thie removes the need for custom Atffiles whose only purpose was to exclude
the helpers that had been built as tests.
---
 tests/lib/librumpclient/Atffile  |  6 ------
 tests/lib/librumpclient/Makefile | 10 ++++++----
 tests/lib/librumphijack/Atffile  |  6 ------
 tests/lib/librumphijack/Makefile | 14 ++++++++------
 4 files changed, 14 insertions(+), 22 deletions(-)
 delete mode 100644 tests/lib/librumpclient/Atffile
 delete mode 100644 tests/lib/librumphijack/Atffile

diff --git a/tests/lib/librumpclient/Atffile b/tests/lib/librumpclient/Atffile
deleted file mode 100644
index e15d428558f6..000000000000
--- a/tests/lib/librumpclient/Atffile
+++ /dev/null
@@ -1,6 +0,0 @@
-Content-Type: application/X-atf-atffile; version="1"
-X-NetBSD-Id: "$NetBSD: Atffile,v 1.1 2011/02/15 15:16:46 pooka Exp $"
-
-prop: test-suite = "NetBSD"
-
-tp-glob: t_*
diff --git a/tests/lib/librumpclient/Makefile b/tests/lib/librumpclient/Makefile
index 60aa68382b57..b43cbca1ac39 100644
--- a/tests/lib/librumpclient/Makefile
+++ b/tests/lib/librumpclient/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2011/03/08 12:40:25 pooka Exp $
+#	$NetBSD: Makefile,v 1.5 2012/12/02 17:36:10 pgoyette Exp $
 #
 
 .include <bsd.own.mk>
@@ -6,12 +6,14 @@
 TESTSDIR=	${TESTSBASE}/lib/librumpclient
 
 TESTS_C=	t_fd
-TESTS_C+=	h_exec
-TESTS_C+=	h_execthr
 
 TESTS_SH=	t_exec
 
-ATFFILE=	yes
+BINDIR=		${TESTSDIR}
+MKMAN=		no
+
+PROGS+=		h_exec
+PROGS+=		h_execthr
 
 LDADD+= -lrumpclient
 LDADD.h_execthr= -lpthread
diff --git a/tests/lib/librumphijack/Atffile b/tests/lib/librumphijack/Atffile
deleted file mode 100644
index e128ca367672..000000000000
--- a/tests/lib/librumphijack/Atffile
+++ /dev/null
@@ -1,6 +0,0 @@
-Content-Type: application/X-atf-atffile; version="1"
-X-NetBSD-Id: "$NetBSD: Atffile,v 1.1 2011/02/06 18:44:29 pooka Exp $"
-
-prop: test-suite = "NetBSD"
-
-tp-glob: t_*
diff --git a/tests/lib/librumphijack/Makefile b/tests/lib/librumphijack/Makefile
index aa9e81ff809a..3242f1dd9a2f 100644
--- a/tests/lib/librumphijack/Makefile
+++ b/tests/lib/librumphijack/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2011/03/14 15:57:23 pooka Exp $
+#	$NetBSD: Makefile,v 1.8 2012/12/02 17:36:10 pgoyette Exp $
 #
 
 .include <bsd.own.mk>
@@ -11,9 +11,13 @@ TESTS_SH+=	t_cwd
 TESTS_SH+=	t_sh
 TESTS_SH+=	t_tcpip
 TESTS_SH+=	t_vfs
-TESTS_C=	h_client
-TESTS_C+=	h_netget
-TESTS_C+=	h_cwd
+
+BINDIR=		${TESTSDIR}
+MKMAN=		no
+
+PROGS+=		h_client
+PROGS+=		h_netget
+PROGS+=		h_cwd
 
 FILES=		netstat.expout index.html
 FILESDIR=	${TESTSDIR}
@@ -24,6 +28,4 @@ FILES+=		ssh_host_key
 FILES+=		ssh_host_key.pub
 FILES+=		sshd_config.in
 
-ATFFILE=	yes
-
 .include <bsd.test.mk>