Deprecate tests/util.

tests/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2011/11/12 01:19:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.35 2012/03/17 16:33:10 jruoho Exp $
 
 .include <bsd.own.mk>
 
@@ -7,8 +7,8 @@
 TESTSDIR=	${TESTSBASE}
 ATFFILE=	yes
 
-SUBDIR=		dev examples fs games include ipf kernel lib libexec net
-SUBDIR+=	rump sbin sys toolchain usr.bin usr.sbin util
+SUBDIR=		bin dev examples fs games include ipf kernel lib libexec net
+SUBDIR+=	rump sbin sys toolchain usr.bin usr.sbin
 
 . if ${MKKMOD} != "no"
 SUBDIR+= modules

tests/bin/Makefile

@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:10 jruoho Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR=       ${TESTSBASE}/bin
+
+TESTS_SUBDIRS=	cp dd df expr pax ps sh tar
+
+.include <bsd.test.mk>

tests/bin/cp/Makefile

@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:10 jruoho Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/bin/cp
+TESTS_SH=	t_cp
+
+.include <bsd.test.mk>

tests/bin/cp/t_cp.sh

@@ -1,4 +1,4 @@
-# $NetBSD: t_cp.sh,v 1.5 2010/11/07 17:51:22 jmmv Exp $
+# $NetBSD: t_cp.sh,v 1.1 2012/03/17 16:33:10 jruoho Exp $
 #
 # Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
 # All rights reserved.

tests/bin/dd/Makefile

@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:11 jruoho Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/bin/dd
+TESTS_SH=	t_dd
+
+.include <bsd.test.mk>

tests/bin/dd/t_dd.sh

@@ -1,4 +1,4 @@
-# $NetBSD: t_dd.sh,v 1.4 2010/12/06 16:43:26 pooka Exp $
+# $NetBSD: t_dd.sh,v 1.1 2012/03/17 16:33:11 jruoho Exp $
 #
 # Copyright (c) 2007 The NetBSD Foundation, Inc.
 # All rights reserved.

tests/bin/df/Makefile

@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.5 2011/08/28 09:39:44 christos Exp $
+# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:11 jruoho Exp $
 
 NOMAN=  	# defined
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/util/df
+TESTSDIR=	${TESTSBASE}/bin/df
 
 TESTS_SH=	t_df
 

tests/bin/df/getmntinfo.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: getmntinfo.c,v 1.4 2010/11/03 16:10:25 christos Exp $	*/
+/*	$NetBSD: getmntinfo.c,v 1.1 2012/03/17 16:33:11 jruoho Exp $	*/
 /*
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.

tests/bin/df/t_df.sh

@@ -1,4 +1,4 @@
-# $NetBSD: t_df.sh,v 1.10 2011/08/29 17:31:41 gson Exp $
+# $NetBSD: t_df.sh,v 1.1 2012/03/17 16:33:11 jruoho Exp $
 #
 # Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
 # All rights reserved.

tests/bin/expr/Makefile

@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:11 jruoho Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/bin/expr
+TESTS_SH=	t_expr
+
+.include <bsd.test.mk>

tests/bin/expr/t_expr.sh

@@ -1,4 +1,4 @@
-# $NetBSD: t_expr.sh,v 1.2 2008/04/30 13:11:00 martin Exp $
+# $NetBSD: t_expr.sh,v 1.1 2012/03/17 16:33:11 jruoho Exp $
 #
 # Copyright (c) 2007 The NetBSD Foundation, Inc.
 # All rights reserved.

tests/bin/pax/Makefile

@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:11 jruoho Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/bin/pax
+TESTS_SH=	t_pax
+
+.include <bsd.test.mk>

tests/bin/pax/t_pax.sh

@@ -1,4 +1,4 @@
-# $NetBSD: t_pax.sh,v 1.5 2010/11/07 17:51:22 jmmv Exp $
+# $NetBSD: t_pax.sh,v 1.1 2012/03/17 16:33:11 jruoho Exp $
 #
 # Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
 # All rights reserved.

tests/bin/ps/Makefile

@@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.2 2007/11/21 15:39:35 jmmv Exp $
+#	$NetBSD: Makefile,v 1.1 2012/03/17 16:33:11 jruoho Exp $
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/util/ps
+TESTSDIR=	${TESTSBASE}/bin/ps
 
 TESTS_SH=	t_ps
 

tests/bin/ps/keywords

@@ -1,4 +1,4 @@
-# $NetBSD: keywords,v 1.1 2007/11/12 15:14:02 jmmv Exp $
+# $NetBSD: keywords,v 1.1 2012/03/17 16:33:11 jruoho Exp $
 #
 # Table of keywords for use with ps "-o" option.
 #

tests/bin/ps/t_ps.sh

@@ -1,4 +1,4 @@
-# $NetBSD: t_ps.sh,v 1.2 2008/04/30 13:11:00 martin Exp $
+# $NetBSD: t_ps.sh,v 1.1 2012/03/17 16:33:11 jruoho Exp $
 #
 # Copyright (c) 2007 The NetBSD Foundation, Inc.
 # All rights reserved.

tests/bin/sh/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2011/11/14 20:23:29 christos Exp $
+# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:11 jruoho Exp $
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/util/sh
+TESTSDIR=	${TESTSBASE}/bin/sh
 
 TESTS_SH=	t_compexit
 TESTS_SH+=	t_exit

tests/bin/sh/t_compexit.sh

@@ -1,4 +1,4 @@
-# $NetBSD: t_compexit.sh,v 1.2 2008/04/30 13:11:00 martin Exp $
+# $NetBSD: t_compexit.sh,v 1.1 2012/03/17 16:33:11 jruoho Exp $
 #
 # Copyright (c) 2007 The NetBSD Foundation, Inc.
 # All rights reserved.

tests/bin/sh/t_evaltested.sh

@@ -1,4 +1,4 @@
-# $NetBSD: t_evaltested.sh,v 1.2 2011/11/14 20:47:33 christos Exp $
+# $NetBSD: t_evaltested.sh,v 1.1 2012/03/17 16:33:11 jruoho Exp $
 #
 # Copyright (c) 2011 The NetBSD Foundation, Inc.
 # All rights reserved.

tests/bin/sh/t_exit.sh

@@ -1,4 +1,4 @@
-# $NetBSD: t_exit.sh,v 1.2 2011/04/29 12:49:36 jmmv Exp $
+# $NetBSD: t_exit.sh,v 1.1 2012/03/17 16:33:11 jruoho Exp $
 #
 # Copyright (c) 2007 The NetBSD Foundation, Inc.
 # All rights reserved.

tests/bin/sh/t_expand.sh

@@ -1,4 +1,4 @@
-# $NetBSD: t_expand.sh,v 1.9 2010/11/17 13:41:52 christos Exp $
+# $NetBSD: t_expand.sh,v 1.1 2012/03/17 16:33:11 jruoho Exp $
 #
 # Copyright (c) 2007, 2009 The NetBSD Foundation, Inc.
 # All rights reserved.

tests/bin/sh/t_fsplit.sh

@@ -1,4 +1,4 @@
-# $NetBSD: t_fsplit.sh,v 1.2 2008/04/30 13:11:00 martin Exp $
+# $NetBSD: t_fsplit.sh,v 1.1 2012/03/17 16:33:11 jruoho Exp $
 #
 # Copyright (c) 2007 The NetBSD Foundation, Inc.
 # All rights reserved.

tests/bin/sh/t_here.sh

@@ -1,4 +1,4 @@
-# $NetBSD: t_here.sh,v 1.2 2008/04/30 13:11:00 martin Exp $
+# $NetBSD: t_here.sh,v 1.1 2012/03/17 16:33:11 jruoho Exp $
 #
 # Copyright (c) 2007 The NetBSD Foundation, Inc.
 # All rights reserved.

tests/bin/sh/t_set_e.sh

@@ -1,4 +1,4 @@
-# $NetBSD: t_set_e.sh,v 1.8 2010/06/06 04:51:13 dholland Exp $
+# $NetBSD: t_set_e.sh,v 1.1 2012/03/17 16:33:11 jruoho Exp $
 #
 # Copyright (c) 2007 The NetBSD Foundation, Inc.
 # All rights reserved.

tests/bin/sh/t_varquote.sh

@@ -1,4 +1,4 @@
-# $NetBSD: t_varquote.sh,v 1.3 2010/07/10 15:57:37 jmmv Exp $
+# $NetBSD: t_varquote.sh,v 1.1 2012/03/17 16:33:11 jruoho Exp $
 #
 # Copyright (c) 2007 The NetBSD Foundation, Inc.
 # All rights reserved.

tests/bin/sh/t_wait.sh

@@ -1,4 +1,4 @@
-# $NetBSD: t_wait.sh,v 1.3 2010/11/07 17:51:24 jmmv Exp $
+# $NetBSD: t_wait.sh,v 1.1 2012/03/17 16:33:11 jruoho Exp $
 #
 # Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
 # All rights reserved.

tests/bin/tar/Makefile

@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:11 jruoho Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/bin/tar
+TESTS_SH=	t_tar
+
+.include <bsd.test.mk>

tests/bin/tar/t_tar.sh

@@ -1,4 +1,4 @@
-# $NetBSD: t_tar.sh,v 1.5 2010/11/07 17:51:22 jmmv Exp $
+# $NetBSD: t_tar.sh,v 1.1 2012/03/17 16:33:11 jruoho Exp $
 #
 # Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
 # All rights reserved.

tests/usr.bin/Makefile

@@ -1,10 +1,12 @@
-#	$NetBSD: Makefile,v 1.7 2012/03/10 19:08:56 christos Exp $
+#	$NetBSD: Makefile,v 1.8 2012/03/17 16:33:11 jruoho Exp $
 #
 
 .include <bsd.own.mk>
 
 TESTSDIR=       ${TESTSBASE}/usr.bin
 
-TESTS_SUBDIRS+= awk diff mkdep pr rump_server shmif_dumpbus unifdef
+TESTS_SUBDIRS=	awk basename bzip2 config cut \
+		diff dirname grep gzip id m4 make mkdep \
+		pr rump_server shmif_dumpbus sdiff sort unifdef xlint
 
 .include <bsd.test.mk>

tests/usr.bin/basename/Makefile

@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:12 jruoho Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/usr.bin/basename
+TESTS_SH=	t_basename
+
+.include <bsd.test.mk>

tests/usr.bin/basename/t_basename.sh

@@ -1,4 +1,4 @@
-# $NetBSD: t_basename.sh,v 1.1 2009/02/13 05:19:51 jmmv Exp $
+# $NetBSD: t_basename.sh,v 1.1 2012/03/17 16:33:12 jruoho Exp $
 #
 # Copyright (c) 2008 The NetBSD Foundation, Inc.
 # All rights reserved.

tests/usr.bin/bzip2/Makefile

@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2009/02/13 05:19:51 jmmv Exp $
+# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:12 jruoho Exp $
 
 NOMAN=		# defined
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/util/bzip2
+TESTSDIR=	${TESTSBASE}/usr.bin/bzip2
 
 TESTS_SH=	t_bzip2
 

tests/usr.bin/bzip2/t_bzip2.sh

@@ -1,4 +1,4 @@
-# $NetBSD: t_bzip2.sh,v 1.1 2009/02/13 05:19:51 jmmv Exp $
+# $NetBSD: t_bzip2.sh,v 1.1 2012/03/17 16:33:12 jruoho Exp $
 #
 # Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
 # All rights reserved.

tests/usr.bin/config/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/07/13 21:13:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:12 jruoho Exp $
 
 SUBDIR=			support
 
@@ -6,7 +6,7 @@ NOMAN=			# defined
 
 .include <bsd.own.mk>
 
-TESTSDIR=		${TESTSBASE}/util/config
+TESTSDIR=		${TESTSBASE}/usr.bin/config
 
 TESTS_SH=		t_config
 

tests/usr.bin/config/support/Makefile

@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:12 jruoho Exp $
+
+SUBDIR=	arch conf
+
+.include <bsd.subdir.mk>

tests/usr.bin/config/support/arch/Makefile

@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:12 jruoho Exp $
+
+SUBDIR=	regress
+
+.include <bsd.subdir.mk>

tests/usr.bin/config/support/arch/regress/Makefile

@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:12 jruoho Exp $
+
+SUBDIR=	conf
+
+.include <bsd.subdir.mk>

tests/usr.bin/config/support/arch/regress/conf/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2010/07/13 21:13:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:12 jruoho Exp $
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/util/config
+TESTSDIR=	${TESTSBASE}/usr.bin/config
 ATFFILE=	no
 
 FILESDIR=	${TESTSDIR}/support/arch/regress/conf

tests/usr.bin/config/support/conf/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2010/07/13 21:13:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:12 jruoho Exp $
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/util/config
+TESTSDIR=	${TESTSBASE}/usr.bin/config
 ATFFILE=	no
 
 FILESDIR=	${TESTSDIR}/support/conf

tests/usr.bin/config/t_config.sh

@@ -1,4 +1,4 @@
-# $NetBSD: t_config.sh,v 1.3 2011/03/25 19:19:46 njoly Exp $
+# $NetBSD: t_config.sh,v 1.1 2012/03/17 16:33:12 jruoho Exp $
 #
 # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
 # All rights reserved.

tests/usr.bin/cut/Makefile

@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2009/02/13 05:19:51 jmmv Exp $
+# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:13 jruoho Exp $
 
 NOMAN=		# defined
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/util/cut
+TESTSDIR=	${TESTSBASE}/usr.bin/cut
 
 TESTS_SH=	t_cut
 

tests/usr.bin/cut/t_cut.sh

@@ -1,4 +1,4 @@
-# $NetBSD: t_cut.sh,v 1.3 2010/11/07 17:51:22 jmmv Exp $
+# $NetBSD: t_cut.sh,v 1.1 2012/03/17 16:33:13 jruoho Exp $
 #
 # Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
 # All rights reserved.

tests/usr.bin/dirname/Makefile

@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:13 jruoho Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/usr.bin/dirname
+TESTS_SH=	t_dirname
+
+.include <bsd.test.mk>

tests/usr.bin/dirname/t_dirname.sh

@@ -1,4 +1,4 @@
-# $NetBSD: t_dirname.sh,v 1.1 2009/02/13 05:19:51 jmmv Exp $
+# $NetBSD: t_dirname.sh,v 1.1 2012/03/17 16:33:13 jruoho Exp $
 #
 # Copyright (c) 2008 The NetBSD Foundation, Inc.
 # All rights reserved.

tests/usr.bin/grep/Makefile

@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2010/06/10 23:49:48 pooka Exp $
+# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:13 jruoho Exp $
 
 NOMAN=		# defined
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/util/grep
+TESTSDIR=	${TESTSBASE}/usr.bin/grep
 
 TESTS_SH=	t_grep
 

tests/usr.bin/grep/t_grep.sh

@@ -1,4 +1,4 @@
-# $NetBSD: t_grep.sh,v 1.5 2011/05/14 17:42:29 jmmv Exp $
+# $NetBSD: t_grep.sh,v 1.1 2012/03/17 16:33:13 jruoho Exp $
 #
 # Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
 # All rights reserved.

tests/usr.bin/gzip/Makefile

@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:13 jruoho Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/usr.bin/gzip
+TESTS_SH=	t_gzip
+
+.include <bsd.test.mk>

tests/usr.bin/gzip/t_gzip.sh

@@ -1,4 +1,4 @@
-# $NetBSD: t_gzip.sh,v 1.3 2010/11/07 17:51:22 jmmv Exp $
+# $NetBSD: t_gzip.sh,v 1.1 2012/03/17 16:33:13 jruoho Exp $
 #
 # Copyright (c) 2008 The NetBSD Foundation, Inc.
 # All rights reserved.

tests/usr.bin/id/Makefile

@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2011/08/17 17:08:59 christos Exp $
+# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:14 jruoho Exp $
 
 NOMAN=		# defined
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/util/id
+TESTSDIR=	${TESTSBASE}/usr.bin/id
 
 TESTS_SH=	t_groups
 TESTS_SH+=	t_id

tests/usr.bin/id/pwgr.c

@@ -1,4 +1,4 @@
-/* $NetBSD: pwgr.c,v 1.3 2010/11/03 16:10:26 christos Exp $ */
+/* $NetBSD: pwgr.c,v 1.1 2012/03/17 16:33:14 jruoho Exp $ */
 /*
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.

tests/usr.bin/id/t_groups.sh

@@ -1,4 +1,4 @@
-# $NetBSD: t_groups.sh,v 1.6 2010/11/07 17:51:23 jmmv Exp $
+# $NetBSD: t_groups.sh,v 1.1 2012/03/17 16:33:14 jruoho Exp $
 #
 # Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
 # All rights reserved.

tests/usr.bin/id/t_id.sh

@@ -1,4 +1,4 @@
-# $NetBSD: t_id.sh,v 1.6 2010/11/07 17:51:23 jmmv Exp $
+# $NetBSD: t_id.sh,v 1.1 2012/03/17 16:33:14 jruoho Exp $
 #
 # Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
 # All rights reserved.

tests/usr.bin/id/t_whoami.sh

@@ -1,4 +1,4 @@
-# $NetBSD: t_whoami.sh,v 1.6 2010/11/07 17:51:23 jmmv Exp $
+# $NetBSD: t_whoami.sh,v 1.1 2012/03/17 16:33:14 jruoho Exp $
 #
 # Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
 # All rights reserved.

tests/usr.bin/m4/Makefile

@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2009/02/13 05:19:52 jmmv Exp $
+# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:14 jruoho Exp $
 
 NOMAN=		# defined
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/util/m4
+TESTSDIR=	${TESTSBASE}/usr.bin/m4
 
 TESTS_SH=	t_m4
 

tests/usr.bin/m4/d_ff_after_dnl.m4.uue

@@ -1,4 +1,4 @@
-$NetBSD: d_ff_after_dnl.m4.uue,v 1.1 2009/02/13 05:19:52 jmmv Exp $
+$NetBSD: d_ff_after_dnl.m4.uue,v 1.1 2012/03/17 16:33:14 jruoho Exp $
 
 begin 644 d_ff_after_dnl.m4
 M"0E42$E3(%-(3U5,1"!32$]7(%50("A,24Y%(#$I"F1N;`D)5$A)4R!32$]5