summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--contrib/netbsd-tests/kernel/t_lockf.c3
-rw-r--r--tests/sys/kern/Makefile8
2 files changed, 11 insertions, 0 deletions
diff --git a/contrib/netbsd-tests/kernel/t_lockf.c b/contrib/netbsd-tests/kernel/t_lockf.c
index d937301..702e612 100644
--- a/contrib/netbsd-tests/kernel/t_lockf.c
+++ b/contrib/netbsd-tests/kernel/t_lockf.c
@@ -102,6 +102,9 @@ trylocks(int id)
(void)fcntl(fd, F_SETLKW, &fl);
if (usleep(sleeptime) < 0)
+#if defined(__FreeBSD__)
+ if (errno != EINTR)
+#endif
err(1, "usleep");
}
printf("%d: done\n", id);
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>
OpenPOWER on IntegriCloud