Rename tests from <foo> to <foo>_test to match the FreeBSD test suite

naming scheme

usr.bin/diff/diff_test was renamed to usr.bin/diff/netbsd_diff_test
to avoid collisions with the renamed FreeBSD test.

MFC after:	1 week
Sponsored by:	Dell EMC Isilon

ObsoleteFiles.inc

@@ -38,6 +38,23 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20170322: rename <x> to <x>_test to match the FreeBSD test suite name scheme
+OLD_FILES+=usr/tests/usr.bin/col/col
+OLD_FILES+=usr/tests/usr.bin/diff/diff
+OLD_FILES+=usr/tests/usr.bin/ident/ident
+OLD_FILES+=usr/tests/usr.bin/mkimg/mkimg
+OLD_FILES+=usr/tests/usr.bin/sdiff/sdiff
+OLD_FILES+=usr/tests/usr.bin/soelim/soelim
+OLD_FILES+=usr/tests/usr.sbin/pw/pw_config_test
+OLD_FILES+=usr/tests/usr.sbin/pw/pw_etcdir_test
+OLD_FILES+=usr/tests/usr.sbin/pw/pw_lock_test
+OLD_FILES+=usr/tests/usr.sbin/pw/pw_groupadd_test
+OLD_FILES+=usr/tests/usr.sbin/pw/pw_groupdel_test
+OLD_FILES+=usr/tests/usr.sbin/pw/pw_groupmod_test
+OLD_FILES+=usr/tests/usr.sbin/pw/pw_useradd_test
+OLD_FILES+=usr/tests/usr.sbin/pw/pw_userdel_test
+OLD_FILES+=usr/tests/usr.sbin/pw/pw_usermod_test
+OLD_FILES+=usr/tests/usr.sbin/pw/pw_usernext_test
 # 20170322: garbage collect old references to igb(4)
 OLD_FILES+=usr/share/man/man4/if_igb.4.gz
 OLD_FILES+=usr/share/man/man4/igb.4.gz

usr.bin/col/tests/Makefile

@@ -2,7 +2,7 @@
 
 PACKAGE=	tests
 
-ATF_TESTS_SH=	col
+ATF_TESTS_SH=	col_test
 
 ${PACKAGE}FILES+=	\
 		rlf.in \

usr.bin/diff/tests/Makefile

@@ -2,7 +2,7 @@
 
 PACKAGE=	tests
 
-ATF_TESTS_SH=	diff
+ATF_TESTS_SH=	diff_test
 
 ${PACKAGE}FILES+=	\
 	input1.in \
@@ -21,13 +21,14 @@ ${PACKAGE}FILES+=	\
 	unified_c9999.out \
 	unified_9999.out
 
-NETBSD_ATF_TESTS_SH+=	diff_test
+NETBSD_ATF_TESTS_SH+=	netbsd_diff_test
 
 ${PACKAGE}FILES+=	\
 	d_mallocv1.in	\
 	d_mallocv2.in
 
-ATF_TESTS_SH_SED_diff_test+=	-e 's,t_diff,diff_test,g'
+ATF_TESTS_SH_SED_netbsd_diff_test+=	-e 's,t_diff,netbsd_diff_test,g'
+ATF_TESTS_SH_SRC_netbsd_diff_test=	t_diff.sh
 
 .include <netbsd-tests.test.mk>
 

usr.bin/ident/tests/Makefile

@@ -2,7 +2,7 @@
 
 PACKAGE=	tests
 
-ATF_TESTS_SH=	ident
+ATF_TESTS_SH=	ident_test
 ${PACKAGE}FILES+=	\
 		test.in \
 		test.out \

usr.bin/mkimg/tests/Makefile

@@ -2,7 +2,7 @@
 
 PACKAGE=	tests
 
-ATF_TESTS_SH=	mkimg
+ATF_TESTS_SH=	mkimg_test
 
 SOURCES!=	cd ${.CURDIR}; echo *.uu
 ${PACKAGE}FILES+=		${SOURCES:S,.gz.uu,,g}

usr.bin/sdiff/tests/Makefile

@@ -2,7 +2,7 @@
 
 PACKAGE=	tests
 
-ATF_TESTS_SH=	sdiff
+ATF_TESTS_SH=	sdiff_test
 
 ${PACKAGE}FILES+=	\
 	d_dot.in \

usr.bin/soelim/tests/Makefile

@@ -2,7 +2,7 @@
 
 PACKAGE=	tests
 
-ATF_TESTS_SH=	soelim
+ATF_TESTS_SH=	soelim_test
 
 ${PACKAGE}FILES+=		nonexisting.in \
 		basic.in \

usr.sbin/pw/tests/Makefile

@@ -8,16 +8,16 @@ PROGS+=		crypt
 WARNS?=		6
 LIBADD+=	crypt
 
-ATF_TESTS_SH=	pw_etcdir \
-		pw_lock \
-		pw_config \
-		pw_groupadd \
-		pw_groupdel \
-		pw_groupmod \
-		pw_useradd \
-		pw_userdel \
-		pw_usermod \
-		pw_usernext
+ATF_TESTS_SH=	pw_etcdir_test \
+		pw_lock_test \
+		pw_config_test \
+		pw_groupadd_test \
+		pw_groupdel_test \
+		pw_groupmod_test \
+		pw_useradd_test \
+		pw_userdel_test \
+		pw_usermod_test \
+		pw_usernext_test
 
 .for tp in ${ATF_TESTS_SH}
 TEST_METADATA.${tp}+=	required_user="root"