diff options
| author | ngie <ngie@FreeBSD.org> | 2015-11-23 08:52:38 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-11-23 08:52:38 +0000 |
| commit | 83975b81667218185ffd807ab1386b9856d10e4c (patch) | |
| tree | 79d66f5ce3b1b5b438532b72a109392d1dffd5dd /tests | |
| parent | 243e40ca7903af22f673885944979008bd9c7d1d (diff) | |
| download | FreeBSD-src-83975b81667218185ffd807ab1386b9856d10e4c.zip FreeBSD-src-83975b81667218185ffd807ab1386b9856d10e4c.tar.gz | |
MFC r290911,r290912:
r290911:
Ignore EINTR from usleep(3) in try_locks(..)
NetBSD's usleep(3) only returns -1/sets errno=EINVAL when `microseconds`
is one million or more
Submitted by: pho
Sponsored by: EMC / Isilon Storage Division
r290912:
Integrate contrib/netbsd-tests/kernel/t_lockf.c into the FreeBSD test suite as
tests/sys/kern/lockf_test
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/sys/kern/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index 04d2fff..337ff73 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -1,5 +1,9 @@ # $FreeBSD$ +SRCTOP= ${.CURDIR:H:H:H} +OBJTOP= ${.OBJDIR:H:H:H} +TESTSRC= ${SRCTOP}/contrib/netbsd-tests/kernel + TESTSDIR= ${TESTSBASE}/sys/kern ATF_TESTS_C+= kern_descrip_test @@ -10,9 +14,13 @@ TEST_METADATA.unix_seqpacket_test+= timeout="15" LDADD.ptrace_test+= -lpthread LDADD.unix_seqpacket_test+= -lpthread +NETBSD_ATF_TESTS_C+= lockf_test + WARNS?= 5 TESTS_SUBDIRS+= acct TESTS_SUBDIRS+= execve +.include <netbsd-tests.test.mk> + .include <bsd.test.mk> |
