Author: ngie
Date: Mon Dec 28 23:05:13 2015
New Revision: 292844
URL: https://svnweb.freebsd.org/changeset/base/292844
Log:
MFC r292317,r292318,r292323,r292324,r292665:
r292317:
Integrate tools/regression/lib/libc/resolv into the FreeBSD test suite as
lib/libc/tests/resolv
Convert the testcases to ATF
Sponsored by: EMC / Isilon Storage Division
r292318:
Add Makefile accidentally missed in r292317
Sponsored by: EMC / Isilon Storage Division
r292323:
Integrate tools/regression/lib/libc/nss into the FreeBSD test suite as
lib/libc/tests/nss
- Convert the testcases to ATF
- Do some style(9) cleanups:
-- Sort headers
-- Apply indentation fixes
-- Remove superfluous parentheses
- Explicitly print out debug printfs for use with `kyua {debug,report}`; for
items that were overly noisy, they've been put behind #ifdef DEBUG
conditionals
- Fix some format strings
Sponsored by: EMC / Isilon Storage Division
r292324:
Iterate down lib/libc/tests/nss...
Sponsored by: EMC / Isilon Storage Division
r292665:
Increase the timeout for resolv_test from the default (300 seconds) to
450 seconds
This is required on slower network connections, and on older releases
(stable/10 seems to be slower as far as name resolution goes.. not sure
why yet).
Remove an outdated comment in the Makefile from when I was working on
this code over a year ago on github
Sponsored by: EMC / Isilon Storage Division
Added:
stable/10/lib/libc/tests/nss/
- copied from r292323, head/lib/libc/tests/nss/
stable/10/lib/libc/tests/resolv/
- copied from r292317, head/lib/libc/tests/resolv/
stable/10/lib/libc/tests/resolv/Makefile
- copied, changed from r292318, head/lib/libc/tests/resolv/Makefile
Modified:
stable/10/etc/mtree/BSD.tests.dist
stable/10/lib/libc/tests/Makefile
stable/10/lib/libc/tests/resolv/resolv_test.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/etc/mtree/BSD.tests.dist
==============================================================================
--- stable/10/etc/mtree/BSD.tests.dist Mon Dec 28 22:52:36 2015
(r292843)
+++ stable/10/etc/mtree/BSD.tests.dist Mon Dec 28 23:05:13 2015
(r292844)
@@ -109,10 +109,14 @@
..
..
..
+ nss
+ ..
regex
data
..
..
+ resolv
+ ..
rpc
..
ssp
Modified: stable/10/lib/libc/tests/Makefile
==============================================================================
--- stable/10/lib/libc/tests/Makefile Mon Dec 28 22:52:36 2015
(r292843)
+++ stable/10/lib/libc/tests/Makefile Mon Dec 28 23:05:13 2015
(r292844)
@@ -12,7 +12,9 @@ TESTS_SUBDIRS+= gen
TESTS_SUBDIRS+= hash
TESTS_SUBDIRS+= inet
TESTS_SUBDIRS+= net
+TESTS_SUBDIRS+= nss
TESTS_SUBDIRS+= regex
+TESTS_SUBDIRS+= resolv
TESTS_SUBDIRS+= rpc
TESTS_SUBDIRS+= stdio
TESTS_SUBDIRS+= stdlib
Copied and modified: stable/10/lib/libc/tests/resolv/Makefile (from r292318,
head/lib/libc/tests/resolv/Makefile)
==============================================================================
--- head/lib/libc/tests/resolv/Makefile Wed Dec 16 05:19:07 2015
(r292318, copy source)
+++ stable/10/lib/libc/tests/resolv/Makefile Mon Dec 28 23:05:13 2015
(r292844)
@@ -6,10 +6,10 @@ BINDIR= ${TESTSDIR}
FILES+= mach
ATF_TESTS_C+= resolv_test
-#TEST_METADATA.resolv_test= timeout="1800"
# Note: this test relies on being dynamically linked. You will get a
# spurious PASS for a statically linked test.
-LIBADD.resolv_test+= pthread
+DPADD.resolv_test+= ${LIBPTHREAD}
+LDADD.resolv_test+= -lpthread
.include <bsd.test.mk>
Modified: stable/10/lib/libc/tests/resolv/resolv_test.c
==============================================================================
--- head/lib/libc/tests/resolv/resolv_test.c Wed Dec 16 05:11:57 2015
(r292317)
+++ stable/10/lib/libc/tests/resolv/resolv_test.c Mon Dec 28 23:05:13
2015 (r292844)
@@ -289,21 +289,31 @@ do {
\
ATF_REQUIRE(run_tests(_hostlist_file, method) == 0); \
} while(0)
-ATF_TC_WITHOUT_HEAD(getaddrinfo_test);
+ATF_TC(getaddrinfo_test);
+ATF_TC_HEAD(getaddrinfo_test, tc) {
+ atf_tc_set_md_var(tc, "timeout", "450");
+}
ATF_TC_BODY(getaddrinfo_test, tc)
{
RUN_TESTS(tc, METHOD_GETADDRINFO);
}
-ATF_TC_WITHOUT_HEAD(gethostby_test);
+ATF_TC(gethostby_test);
+ATF_TC_HEAD(gethostby_test, tc) {
+ atf_tc_set_md_var(tc, "timeout", "450");
+}
ATF_TC_BODY(gethostby_test, tc)
{
RUN_TESTS(tc, METHOD_GETHOSTBY);
}
-ATF_TC_WITHOUT_HEAD(getipnodeby_test);
+ATF_TC(getipnodeby_test);
+ATF_TC_HEAD(getipnodeby_test, tc) {
+
+ atf_tc_set_md_var(tc, "timeout", "450");
+}
ATF_TC_BODY(getipnodeby_test, tc)
{
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
