MFC r290255:

Add _test suffix to multiple tests in lib/libc to conform to the design noted
in the FreeBSD Test Suite wiki

Sponsored by: EMC / Isilon Storage Division

4 files changed, 68 insertions, 37 deletions

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 400901f..4f8203f 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,37 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20151115: added missing _test suffix on multiple tests in lib/libc
+OLD_FILES+=usr/tests/lib/libc/c063/faccessat
+OLD_FILES+=usr/tests/lib/libc/c063/fchmodat
+OLD_FILES+=usr/tests/lib/libc/c063/fchownat
+OLD_FILES+=usr/tests/lib/libc/c063/fexecve
+OLD_FILES+=usr/tests/lib/libc/c063/fstatat
+OLD_FILES+=usr/tests/lib/libc/c063/linkat
+OLD_FILES+=usr/tests/lib/libc/c063/mkdirat
+OLD_FILES+=usr/tests/lib/libc/c063/mkfifoat
+OLD_FILES+=usr/tests/lib/libc/c063/mknodat
+OLD_FILES+=usr/tests/lib/libc/c063/openat
+OLD_FILES+=usr/tests/lib/libc/c063/readlinkat
+OLD_FILES+=usr/tests/lib/libc/c063/renameat
+OLD_FILES+=usr/tests/lib/libc/c063/symlinkat
+OLD_FILES+=usr/tests/lib/libc/c063/unlinkat
+OLD_FILES+=usr/tests/lib/libc/c063/utimensat
+OLD_FILES+=usr/tests/lib/libc/string/memchr
+OLD_FILES+=usr/tests/lib/libc/string/memcpy
+OLD_FILES+=usr/tests/lib/libc/string/memmem
+OLD_FILES+=usr/tests/lib/libc/string/memset
+OLD_FILES+=usr/tests/lib/libc/string/strcat
+OLD_FILES+=usr/tests/lib/libc/string/strchr
+OLD_FILES+=usr/tests/lib/libc/string/strcmp
+OLD_FILES+=usr/tests/lib/libc/string/strcpy
+OLD_FILES+=usr/tests/lib/libc/string/strcspn
+OLD_FILES+=usr/tests/lib/libc/string/strerror
+OLD_FILES+=usr/tests/lib/libc/string/strlen
+OLD_FILES+=usr/tests/lib/libc/string/strpbrk
+OLD_FILES+=usr/tests/lib/libc/string/strrchr
+OLD_FILES+=usr/tests/lib/libc/string/strspn
+OLD_FILES+=usr/tests/lib/libc/string/swab
 # 20151025: remove links to removed/unimplemented mbuf(9) macros
 OLD_FILES+=usr/share/man/man9/MEXT_ADD_REF.9.gz
 OLD_FILES+=usr/share/man/man9/MEXTFREE.9.gz
diff --git a/lib/libc/tests/c063/Makefile b/lib/libc/tests/c063/Makefile
index 0b8f3b0..b81f575 100644
--- a/lib/libc/tests/c063/Makefile
+++ b/lib/libc/tests/c063/Makefile
@@ -4,20 +4,20 @@ TESTSDIR=	${TESTSBASE}/lib/libc/c063
 
 #TODO: t_o_search, t_utimensat
 
-NETBSD_ATF_TESTS_C=	faccessat
-NETBSD_ATF_TESTS_C+=	fchmodat
-NETBSD_ATF_TESTS_C+=	fchownat
-NETBSD_ATF_TESTS_C+=	fexecve
-NETBSD_ATF_TESTS_C+=	fstatat
-NETBSD_ATF_TESTS_C+=	linkat
-NETBSD_ATF_TESTS_C+=	mkdirat
-NETBSD_ATF_TESTS_C+=	mkfifoat
-NETBSD_ATF_TESTS_C+=	mknodat
-NETBSD_ATF_TESTS_C+=	openat
-NETBSD_ATF_TESTS_C+=	readlinkat
-NETBSD_ATF_TESTS_C+=	renameat
-NETBSD_ATF_TESTS_C+=	symlinkat
-NETBSD_ATF_TESTS_C+=	unlinkat
+NETBSD_ATF_TESTS_C=	faccessat_test
+NETBSD_ATF_TESTS_C+=	fchmodat_test
+NETBSD_ATF_TESTS_C+=	fchownat_test
+NETBSD_ATF_TESTS_C+=	fexecve_test
+NETBSD_ATF_TESTS_C+=	fstatat_test
+NETBSD_ATF_TESTS_C+=	linkat_test
+NETBSD_ATF_TESTS_C+=	mkdirat_test
+NETBSD_ATF_TESTS_C+=	mkfifoat_test
+NETBSD_ATF_TESTS_C+=	mknodat_test
+NETBSD_ATF_TESTS_C+=	openat_test
+NETBSD_ATF_TESTS_C+=	readlinkat_test
+NETBSD_ATF_TESTS_C+=	renameat_test
+NETBSD_ATF_TESTS_C+=	symlinkat_test
+NETBSD_ATF_TESTS_C+=	unlinkat_test
 
 CFLAGS+= -D_INCOMPLETE_XOPEN_C063
 
diff --git a/lib/libc/tests/setjmp/Makefile b/lib/libc/tests/setjmp/Makefile
index e4c7ae5..e303726 100644
--- a/lib/libc/tests/setjmp/Makefile
+++ b/lib/libc/tests/setjmp/Makefile
@@ -2,11 +2,11 @@
 
 TESTSDIR=	${TESTSBASE}/lib/libc/setjmp
 
-NETBSD_ATF_TESTS_C=	t_setjmp
-NETBSD_ATF_TESTS_C+=	t_threadjmp
+NETBSD_ATF_TESTS_C=	setjmp_test
+NETBSD_ATF_TESTS_C+=	threadjmp_test
 
-DPADD.t_threadjmp+= ${LIBPTHREAD}
-LDADD.t_threadjmp+= -lpthread
+DPADD.threadjmp_test+= ${LIBPTHREAD}
+LDADD.threadjmp_test+= -lpthread
 
 WARNS?=	4
 
diff --git a/lib/libc/tests/string/Makefile b/lib/libc/tests/string/Makefile
index 0b7f58a..3f97edc 100644
--- a/lib/libc/tests/string/Makefile
+++ b/lib/libc/tests/string/Makefile
@@ -9,30 +9,30 @@ TESTSDIR=	${TESTSBASE}/lib/libc/string
 
 # TODO: popcount, stresep
 
-NETBSD_ATF_TESTS_C+=	memchr
-NETBSD_ATF_TESTS_C+=	memcpy
-NETBSD_ATF_TESTS_C+=	memmem
-NETBSD_ATF_TESTS_C+=	memset
-NETBSD_ATF_TESTS_C+=	strcat
-NETBSD_ATF_TESTS_C+=	strchr
-NETBSD_ATF_TESTS_C+=	strcmp
-NETBSD_ATF_TESTS_C+=	strcpy
-NETBSD_ATF_TESTS_C+=	strcspn
-NETBSD_ATF_TESTS_C+=	strerror
-NETBSD_ATF_TESTS_C+=	strlen
-NETBSD_ATF_TESTS_C+=	strpbrk
-NETBSD_ATF_TESTS_C+=	strrchr
-NETBSD_ATF_TESTS_C+=	strspn
-NETBSD_ATF_TESTS_C+=	swab
+NETBSD_ATF_TESTS_C+=	memchr_test
+NETBSD_ATF_TESTS_C+=	memcpy_test
+NETBSD_ATF_TESTS_C+=	memmem_test
+NETBSD_ATF_TESTS_C+=	memset_test
+NETBSD_ATF_TESTS_C+=	strcat_test
+NETBSD_ATF_TESTS_C+=	strchr_test
+NETBSD_ATF_TESTS_C+=	strcmp_test
+NETBSD_ATF_TESTS_C+=	strcpy_test
+NETBSD_ATF_TESTS_C+=	strcspn_test
+NETBSD_ATF_TESTS_C+=	strerror_test
+NETBSD_ATF_TESTS_C+=	strlen_test
+NETBSD_ATF_TESTS_C+=	strpbrk_test
+NETBSD_ATF_TESTS_C+=	strrchr_test
+NETBSD_ATF_TESTS_C+=	strspn_test
+NETBSD_ATF_TESTS_C+=	swab_test
 
 SRCS.strerror2_test=	strerror_test.c
 
 .include "../Makefile.netbsd-tests"
 
-LDADD.memchr+=	-lmd
-DPADD.memchr+=	${LIBMD}
+LDADD.memchr_test+=	-lmd
+DPADD.memchr_test+=	${LIBMD}
 
-LDADD.memcpy+=	-lmd
-DPADD.memcpy+=	${LIBMD}
+LDADD.memcpy_test+=	-lmd
+DPADD.memcpy_test+=	${LIBMD}
 
 .include <bsd.test.mk>