From owner-svn-src-stable@freebsd.org Mon Nov 23 08:52:39 2015 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D6986A36592; Mon, 23 Nov 2015 08:52:39 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 814C51D91; Mon, 23 Nov 2015 08:52:39 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAN8qcpQ094057; Mon, 23 Nov 2015 08:52:38 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAN8qcxe094055; Mon, 23 Nov 2015 08:52:38 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511230852.tAN8qcxe094055@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Mon, 23 Nov 2015 08:52:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r291179 - in stable/10: contrib/netbsd-tests/kernel tests/sys/kern X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Nov 2015 08:52:39 -0000 Author: ngie Date: Mon Nov 23 08:52:38 2015 New Revision: 291179 URL: https://svnweb.freebsd.org/changeset/base/291179 Log: 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 Modified: stable/10/contrib/netbsd-tests/kernel/t_lockf.c stable/10/tests/sys/kern/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/netbsd-tests/kernel/t_lockf.c ============================================================================== --- stable/10/contrib/netbsd-tests/kernel/t_lockf.c Mon Nov 23 08:31:41 2015 (r291178) +++ stable/10/contrib/netbsd-tests/kernel/t_lockf.c Mon Nov 23 08:52:38 2015 (r291179) @@ -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); Modified: stable/10/tests/sys/kern/Makefile ============================================================================== --- stable/10/tests/sys/kern/Makefile Mon Nov 23 08:31:41 2015 (r291178) +++ stable/10/tests/sys/kern/Makefile Mon Nov 23 08:52:38 2015 (r291179) @@ -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+= time LDADD.ptrace_test+= -lpthread LDADD.unix_seqpacket_test+= -lpthread +NETBSD_ATF_TESTS_C+= lockf_test + WARNS?= 5 TESTS_SUBDIRS+= acct TESTS_SUBDIRS+= execve +.include + .include