From nobody Sun Jul 14 18:30:17 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WMYmB18Hcz5R86W; Sun, 14 Jul 2024 18:30:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WMYm95DKJz4Y1D; Sun, 14 Jul 2024 18:30:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720981817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=obMy6WHtUfVUWvQ7lsbZ+AnQ7QQrTa2mq2igJ6ov/zg=; b=Tu7jGb2kRI56AZqKgPv81pE6EtZJoW9CDCWpEOHuwCSdmjmwsXNkd7IjlNrUJHx5kIP7XZ N8hiLl7O4M/OX/srTZZM6x/rk7W8qkgrDjcPP+lzRTRXpKz8ZQZCjnim9+bKomslNhQgWv EfkZbryeVOtujiO5YzFnKxVTW689jT8wPANtWSxxmdD3PiEa/f7InA8FTJ5vXJvmiz6gxP UqOeam7MSvjzcn2VUCqQS7mjXgjara2Yxgn/lbuX5WqO5mo/wPp//CQ0dwjjCqirxTbTLE o5o86S9GCuKP44NwVIhc/FdelbQm6Xc4CnUrQNxEoY3DcgAJc72DOE42y9E/3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720981817; a=rsa-sha256; cv=none; b=UJS9fBr6KL1tZhrvum+AtH5+IOTzRFdF6cYpSVQpEunb5Xpt+HS4/crNNWLSZ66P3/qaVX S04hG5OpmxD/LGmqK9VYhJoESZZBpsDnPCv+bTzW/oWf3YDOQvS0Ll9/amspGfMq3k8NQB qKJbqlKMgbPc1ZuPe0EhGBv/tD7PtVMdl5tM/4FDWBQy5qi3vgDn5xLA1fjrl3ATNoXhqE PxbhOOWH4MfrjOiD0ykjtctRagP+ISnmKVFtHYt5Os/SwBQvPUrrfhbuDKfThUv7WVFAcL +s1gb9x1VNKj+rR5WGC3VS2xnPAggx62BxZ8+JBJEl/meAGZhzOwpsu/MvxAgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720981817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=obMy6WHtUfVUWvQ7lsbZ+AnQ7QQrTa2mq2igJ6ov/zg=; b=XVrNC32X/5vPff3UYNJXuwP2tZgvOZu/bUevhs+nS4QVZOh9RPT8B+sdsb3wdTLHcPnXnl Obj4r4qsh7R8shsryxXPr4eRL9c0nlOgmRtgDnUfd2Mr2pJRLsNmTVCwP6U1OAmnWr+BwM 59JFrqMXAfXDqk5hBhDSvxpE+HM1nFWJGED2tR9vKEpF57wfo1I6TKfPA3nLHbrIbnM/O9 is6OZNfjJcjMuomCZUuTdbCKooCd5WI61zgEXBQtul6JvGyoE/GFqlNbcmHeBk9B37YpqP E/Xz5LHayOFcEW6wceSAU6Ls4hLSCjUZ7Kk5arQcZ0FbitL9IpMyJ3rexhX5sg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WMYm94r3WzKvj; Sun, 14 Jul 2024 18:30:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46EIUHPj020320; Sun, 14 Jul 2024 18:30:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46EIUHOJ020312; Sun, 14 Jul 2024 18:30:17 GMT (envelope-from git) Date: Sun, 14 Jul 2024 18:30:17 GMT Message-Id: <202407141830.46EIUHOJ020312@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 498b3b494b8b - main - lockf tests: Fix a race List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 498b3b494b8b3e500e555a9653d950b9e25a2f1a Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=498b3b494b8b3e500e555a9653d950b9e25a2f1a commit 498b3b494b8b3e500e555a9653d950b9e25a2f1a Author: Mark Johnston AuthorDate: 2024-07-14 16:13:13 +0000 Commit: Mark Johnston CommitDate: 2024-07-14 18:29:14 +0000 lockf tests: Fix a race The test launches lockf(1) in the background and races with it, so it shouldn't be using atf_check to check that lockf won the race. MFC after: 1 week --- usr.bin/lockf/tests/lockf_test.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/usr.bin/lockf/tests/lockf_test.sh b/usr.bin/lockf/tests/lockf_test.sh index cc6938d2306e..d73c7590653d 100644 --- a/usr.bin/lockf/tests/lockf_test.sh +++ b/usr.bin/lockf/tests/lockf_test.sh @@ -47,7 +47,9 @@ basic_body() lpid=$! # Make sure that the lock exists... - atf_check test -e "testlock" + while ! test -e "testlock"; do + sleep 0.1 + done # Attempt both verbose and silent re-lock atf_check -s exit:${EX_TEMPFAIL} -e not-empty \