Module Name: src
Committed By: pgoyette
Date: Sun Dec 2 17:36:10 UTC 2012
Modified Files:
src/tests/lib/librumpclient: Makefile
src/tests/lib/librumphijack: Makefile
Removed Files:
src/tests/lib/librumpclient: Atffile
src/tests/lib/librumphijack: Atffile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 src/tests/lib/librumpclient/Atffile
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/librumpclient/Makefile
cvs rdiff -u -r1.1 -r0 src/tests/lib/librumphijack/Atffile
cvs rdiff -u -r1.7 -r1.8 src/tests/lib/librumphijack/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/librumpclient/Makefile
diff -u src/tests/lib/librumpclient/Makefile:1.4 src/tests/lib/librumpclient/Makefile:1.5
--- src/tests/lib/librumpclient/Makefile:1.4 Tue Mar 8 12:40:25 2011
+++ src/tests/lib/librumpclient/Makefile Sun Dec 2 17:36:10 2012
@@ -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
Index: src/tests/lib/librumphijack/Makefile
diff -u src/tests/lib/librumphijack/Makefile:1.7 src/tests/lib/librumphijack/Makefile:1.8
--- src/tests/lib/librumphijack/Makefile:1.7 Mon Mar 14 15:57:23 2011
+++ src/tests/lib/librumphijack/Makefile Sun Dec 2 17:36:10 2012
@@ -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>
