From nobody Thu Jun 27 15:31:18 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 4W92bW1hyNz5Pv34; Thu, 27 Jun 2024 15:31:19 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W92bV4WtNz4Ckd; Thu, 27 Jun 2024 15:31:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719502278; 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=cJwEULCoV4tf4xW2/9pNFH+XMinw8eq4GiVAB9Ow2fs=; b=fwOs3GgtOKtVu3HIxL55c0XmzultMak0ulP2wjmt1PwhK+ycBS5fNXlhtwFtjraK7wZCOH PE8XN0CmepiXLQijkMoKHrbljBFSz06QURvQESb/f8b/jn/WAdnExpvh6INurVUCBDEy+S U9FaBdeMDxwLdJBOlrOcBs/RJWW8GXE1V/KUYugsfaqBYDxfsA9gxlKsfFXew/L/MEveUr XGG8Drai/1i+svn/HX5Upnh8S2Eoj3Qhqbn2gGZqlYmrcLXagkgOo3f99979Hi85ApEX3+ i3G/jVncevHxZdvazI1U23lrluT+hd5hEIcFLXuaNafHMRyBdlDbfTACiQ0BYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719502278; a=rsa-sha256; cv=none; b=XzNWRbd0Fyoy2d/H+0uP3z4xxPxpWqvQ7ANnQKcdGHn58CakcmwdsWAtNlXyXHH18GFIvR Q9+0NSetl/nb1MLJH0s2NyNJ4LjfFF1fVs5FyN+MFkqr7uGPpz64eHOu1YAKqEr4+TZar1 ezIM3zXU75snzsYl/QXzxTVpHC0Vo2LQqc8JfGeedRXgexg9mchG48q9eOe18iS2UJLrxy lf0PjsyooapoUASIAdvOmpSQ1+jxHKHxtfXuq+l1GMW3UzAXLvf3k6oGyH2OtfZ2P15Tuh CYWvoxVvg+sltt9S4np4lE4G75NEMy6zmPrThVhC7JsVG9iS0207r+xAsOjcyQ== 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=1719502278; 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=cJwEULCoV4tf4xW2/9pNFH+XMinw8eq4GiVAB9Ow2fs=; b=MZY2zS+C0iBnmEGPMo8dGXTApdtAwlqGZ+auzvfRTa+1A3GlgN4M9G6LC7EwmkBCg8wpcv PA4QExC/SflIxCHStxbGYeLWreprDgdbSWApix6SaJm41saPLYcTDZT7dlsG+JrL0uA371 0sKZzQhG7MO7+zdco7r1O0YAgX3Lus48eua5/lYAu5EwO2lOzca1COqxPgAHDNgToXUQOY WkeiUdpg65rHfUkpqOf5QoANj1O8pJFAsrST6Sw+gh+LguvaZJ1zZCLiNYFq3M8l0RLR3D BEN3hnz95hVwRr+ek1HzDJBOGmg/Aj9zbSnDQg+sJTeE8EG2MG62LGFtvkU3gQ== 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 4W92bV46ggzJ6D; Thu, 27 Jun 2024 15:31:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45RFVI7T079184; Thu, 27 Jun 2024 15:31:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RFVIDD079181; Thu, 27 Jun 2024 15:31:18 GMT (envelope-from git) Date: Thu, 27 Jun 2024 15:31:18 GMT Message-Id: <202406271531.45RFVIDD079181@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: e437440b7aa4 - stable/14 - uniq tests: Make uniq_test:stdout more reliable 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: e437440b7aa4a9f36d2219fc32cb6bd60d118dd6 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e437440b7aa4a9f36d2219fc32cb6bd60d118dd6 commit e437440b7aa4a9f36d2219fc32cb6bd60d118dd6 Author: Mark Johnston AuthorDate: 2024-06-14 00:00:47 +0000 Commit: Mark Johnston CommitDate: 2024-06-27 15:27:42 +0000 uniq tests: Make uniq_test:stdout more reliable When running regression tests in paralle, this one occasionally fails because uniq exits with status 0. I believe this is because the test is a bit racy: it assumes that true(1) will exit before uniq writes to standard out. Just sleep for a bit to give the other end of the pipe to exit. Reviewed by: des MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45534 (cherry picked from commit d9220f64da8b1d55b15259e8b266b50371ed4f47) --- usr.bin/uniq/tests/uniq_test.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/uniq/tests/uniq_test.sh b/usr.bin/uniq/tests/uniq_test.sh index 804e82ce7766..9d37245dee4e 100755 --- a/usr.bin/uniq/tests/uniq_test.sh +++ b/usr.bin/uniq/tests/uniq_test.sh @@ -167,6 +167,8 @@ stdout_head() { stdout_body() { ( trap "" PIPE + # Give true(1) some time to exit. + sleep 1 echo a | uniq 2>stderr echo $? >result ) | true