From nobody Fri Jun 14 01:21:13 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 4W0hLd5nZVz5N2sh; Fri, 14 Jun 2024 01:21:13 +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 4W0hLd59hNz4VP0; Fri, 14 Jun 2024 01:21:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718328073; 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=cYR6Hzpv16ZSLzq6Z/KgjdsuY47Iaj/Hl+m6s5pSjJY=; b=ik7cZmPkszlWuJjJivekkhzrXZUrtziQbXam6eyvCYKNvkPcffEbAwyQ+X2kAGcj7asSgJ Xu8VUptAmC+qzFgDStfS3sOZe+ks6vN4ZXN3jvFN/isscug3BAg3NE3A1WvkGklGBdb9+i BFrzJ0mZb4qMOKlLqCa8TavexsGXY4RbB4c/u/o+mgCwW1CbdJRxLpkW699JjhQKJ5WlgG O8L58s7o4P2mEvqlQN/8a6ESHOacWVdtdFT1wz3oLI/XeKuVlx9rYvpuUyQHnbhmYN6rM0 NkLCm06SFCWz68VIabKeVzHLkPSGRl/sc05EFrJrQ2tLfe4bceQ/fY0uDIXymw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718328073; a=rsa-sha256; cv=none; b=Fecpagyn4++tXEUA8gYdJ5YLLJKx6Tm5xKrr8hMP6xynDsE2nQKWmiRk0UuZzmJIdJ7qtA PJaEphvPT4YYuk3efsfeVFMjJvAG3/9vSM89Rf33l+le+cx3NCQB5Gl/Ygs/k9EbPb8Pqc Bd8wCLrk/k8TxMdp2kaLzvwO7fvwPriBujs6G8IQ47ksqEcTfa106HC3IGwuicW0mwu6Bo E0dAlMepYYvO7qEexBsGI+2mhipIxKPwHtN2Zdi5lvel6j6/0JljANyNDkfMGdOxSyN4nq 6Jsyst+uSNr7ogEDZ2B06N7qFiyjyx8z8n1xYiW25+TSBcL/KlDMCPzCER/+6A== 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=1718328073; 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=cYR6Hzpv16ZSLzq6Z/KgjdsuY47Iaj/Hl+m6s5pSjJY=; b=DyeTAJWejMWE74iYW+i3NCW6ZTrV8bZUe6bNDiJjGEw1987f+lfP8Ro1wSYq4+XBqBLQ7a hn46nK0W4O7ZcXHYrSYmBF+GLutn69GGnJbdTLVodvG3s+ixUcUhP4Vvzq5n2H60sqXlDc ZvXtREOq/LLlOQaBLmZQXqzD/DDj7KQeGRP0sDlz39un3iC/XYCrOGZ+/dAc184/FBJxRd oIzFIQRRGafLD5hZUV+WMiuVXU7MRtdYLam4iKuAPVVFC4jxcXzfFZG2vvk9t5GZ4uASoU NVokqzlseVCBFwAtGgrB53QIulUJCyKb/xvPuRXKPSbUCOfHoc+DXocBeNScpQ== 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 4W0hLd4n4pz10xf; Fri, 14 Jun 2024 01:21:13 +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 45E1LDxC054561; Fri, 14 Jun 2024 01:21:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45E1LDgQ054558; Fri, 14 Jun 2024 01:21:13 GMT (envelope-from git) Date: Fri, 14 Jun 2024 01:21:13 GMT Message-Id: <202406140121.45E1LDgQ054558@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: d9220f64da8b - main - uniq tests: Make uniq_test:stdout more reliable 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: d9220f64da8b1d55b15259e8b266b50371ed4f47 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d9220f64da8b1d55b15259e8b266b50371ed4f47 commit d9220f64da8b1d55b15259e8b266b50371ed4f47 Author: Mark Johnston AuthorDate: 2024-06-14 00:00:47 +0000 Commit: Mark Johnston CommitDate: 2024-06-14 00:00:47 +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 --- 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