From nobody Mon Jul 22 00:55:38 2024 X-Original-To: dev-commits-src-all@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 4WS1zZ60qzz5Qwr7; Mon, 22 Jul 2024 00:55:38 +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 4WS1zZ2cSMz4jDV; Mon, 22 Jul 2024 00:55:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721609738; 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=/boUohqG21H0op7wiTDg8FaZyDou3UlhCh7TahOH5To=; b=XK/NLD7LvceBsyQlupgPVzxGNsuPw7+hm2YP2Y35Zk39MxOsO8txVhhik83c48hO4h3mCj 09R3x4ym4/SHeCZFRnbwJmkonckZlmBa2ol903eZncIX6X89oZPKYDb7Ac/MUVwXPTYLRf uhokKY+9i8isfRYFXGAeu1zih7PRXG4H2SrkEFPiss/aC5NmKCA4spghK7IkACXuwXTOHY 06+wvkLlWEDTH2U0kANamKTs0uBy+yTmTM4QZFk/w0hjw19dnWRBNM5xqyJIXWrVKW9hZk wttiHjqJFIBkJtPq3yToh4Ey59NYvnwMmp8LJri9yO/Z/YRMKfWmwSntVBI1+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721609738; a=rsa-sha256; cv=none; b=D8U8NDcd3IEnLf/OACF5HLWo5WCU8nCXv04OB9c85qv8xEv8qrrDfIFa8gRcCZ+E02WpFl 8LAZpog6WxGvzDKgfaQRObrQDwHSrnCwLbTQL/VTrEJk0lDD13LcLtp6MfpPvVSUEI44SR 66wS48M/i5CzSLz7IMrwfUk6+H6uCTPDLyqwzS+3o5j9t0TiLx9BFSP6J4f1S/Iu+Md66G YNNN45BWqK9pchf/SQa/IStNovXO2wL2gp6ZdPJ7TQ8qE1URGQ1M1UlfyAwUTmXi6rhs+j jgEUITiTOejaIFcRE/sEaZBj6pEzyvZ4D+NP7AhDvhivnuSRKvOe8p7G1LPm3w== 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=1721609738; 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=/boUohqG21H0op7wiTDg8FaZyDou3UlhCh7TahOH5To=; b=NAJa3tXQApcS+h2u6LNoPuLGCTsq9kyzlTEIB9mpEDu2oDikKz/K8N1UM8Ak3todBRGdiF ZoT68EUCbFl4BIdoY0d10F8V4UXN5qiXp8xAKhpXh/R7wXsXDwJra2SUC19U1zwLO975li 4cQzAn+Js9r71VFwuuT3x+oulKTyEND2DdISfHfmLP2lF4xvL+qKbKHwbHlWJ/0loLEnXs xSx26D16Ad6HIW4qIIjgfUTdp1GBEGdmkk6Syvis5lcDkXgrex99KwtJ4/SlqFGmrMTSjL P/RxW4pRaxSfLhO0+Uf1+GA2uuml2pMVF6JxMW9P2v1U4dNLxf4wlOv+YoPnCw== 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 4WS1zZ2D4lzNcb; Mon, 22 Jul 2024 00:55:38 +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 46M0tcCK007322; Mon, 22 Jul 2024 00:55:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46M0tc12007319; Mon, 22 Jul 2024 00:55:38 GMT (envelope-from git) Date: Mon, 22 Jul 2024 00:55:38 GMT Message-Id: <202407220055.46M0tc12007319@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: a8a1633e34f1 - stable/14 - lockf tests: Fix a race List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: a8a1633e34f1961f724c5ede96cdb435702b194d Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a8a1633e34f1961f724c5ede96cdb435702b194d commit a8a1633e34f1961f724c5ede96cdb435702b194d Author: Mark Johnston AuthorDate: 2024-07-14 16:13:13 +0000 Commit: Mark Johnston CommitDate: 2024-07-22 00:55:27 +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 (cherry picked from commit 498b3b494b8b3e500e555a9653d950b9e25a2f1a) --- 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 \