Add _test suffix to multiple tests in lib/libc to conform to the design noted

in the FreeBSD Test Suite wiki

MFC after: 3 days
Sponsored by: EMC / Isilon Storage Division

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 78f6aab8794d4f5e8331e26a0fe49ca272c87994..ffead732347089dae214275746747510439ef689 100644 (file)
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,37 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20151101: 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
 # 20151101: 430.status-rwho was renamed to 430.status-uptime
 OLD_FILES+=etc/periodic/daily/430.status-rwho
 # 20151030: OpenSSL 1.0.2d import

diff --git a/lib/libc/tests/c063/Makefile b/lib/libc/tests/c063/Makefile
index 2e4565cdf318a828f02061662a4036edc0958730..05da6ea212a991169d57c3d4a1a641710775a029 100644 (file)
--- a/lib/libc/tests/c063/Makefile
+++ b/lib/libc/tests/c063/Makefile
@@ -2,21 +2,21 @@
 
 #TODO: t_o_search
 
-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+=   utimensat
+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
+NETBSD_ATF_TESTS_C+=   utimensat_test
 
 CFLAGS+= -D_INCOMPLETE_XOPEN_C063
 

diff --git a/lib/libc/tests/setjmp/Makefile b/lib/libc/tests/setjmp/Makefile
index 0ca25774beef3b586edfbd6c978b3c9db6a88345..ac962c2d8d6d77d61cb06fb7aa962bd23f9ede7e 100644 (file)
--- a/lib/libc/tests/setjmp/Makefile
+++ b/lib/libc/tests/setjmp/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
-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 d91af08a27f1b19ead8b69bbe941fed5f89ec74a..fc9c1af4ded40383d5c136dd71b201eca764345d 100644 (file)
--- a/lib/libc/tests/string/Makefile
+++ b/lib/libc/tests/string/Makefile
@@ -4,28 +4,28 @@
 
 # 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
 
 .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>