Source-Changes-HG archive

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

[src/trunk]: src/tests/lib Helper programs are programs, not tests, so build ...



details:   https://anonhg.NetBSD.org/src/rev/e53af522f0bc
branches:  trunk
changeset: 783049:e53af522f0bc
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Sun Dec 02 17:36:10 2012 +0000

description:
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.

diffstat:

 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(-)

diffs (80 lines):

diff -r 35e7688d1ae8 -r e53af522f0bc tests/lib/librumpclient/Atffile
--- a/tests/lib/librumpclient/Atffile   Sun Dec 02 15:34:36 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 35e7688d1ae8 -r e53af522f0bc tests/lib/librumpclient/Makefile
--- a/tests/lib/librumpclient/Makefile  Sun Dec 02 15:34:36 2012 +0000
+++ b/tests/lib/librumpclient/Makefile  Sun Dec 02 17:36:10 2012 +0000
@@ -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 -r 35e7688d1ae8 -r e53af522f0bc tests/lib/librumphijack/Atffile
--- a/tests/lib/librumphijack/Atffile   Sun Dec 02 15:34:36 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 35e7688d1ae8 -r e53af522f0bc tests/lib/librumphijack/Makefile
--- a/tests/lib/librumphijack/Makefile  Sun Dec 02 15:34:36 2012 +0000
+++ b/tests/lib/librumphijack/Makefile  Sun Dec 02 17:36:10 2012 +0000
@@ -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_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.pub
 FILES+=                sshd_config.in
 
-ATFFILE=       yes
-
 .include <bsd.test.mk>



Home | Main Index | Thread Index | Old Index