From nobody Mon Jun 16 08:53:55 2025 X-Original-To: dev-commits-src-branches@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 4bLP1b37nmz5Vq6S; Mon, 16 Jun 2025 08:53:55 +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 4bLP1b1mZHz3wMX; Mon, 16 Jun 2025 08:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750064035; 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=LiTvZLyUOUkqjL77rBvG6CgZH4yFcUUgYpDApZWXeWs=; b=PpPhLmoDtWSbYmUdoJioUtq3jRNsXaViQJoigGtKXsXEQMVrjtG/GnOyowTZMHXQXXdzbK gZMlI4X5gXPWF17NEOwSai12mvvI/5mwz4UAtN3TCi8IveS2EvGb7XdpmnEATAC6nDA0bM 4lqd7RHIMcuRVCvBBrLYZJPDOEzin5ncpfvzdjs+idmrQ0kCJyy6rJE15FWv7ar4TYuX1r pNuaO+ceTIpg+i5fnmaXhmdBfo0ZtHotwwGt2tJ588/L4Pssw2rn0c9zfLFPZeM7HHl5az 7qOiHB4vgtB8EhYJoOrx3UN6BqJ2sHsoVR6YuH8MUz9b3lSUEMRHTOR8ESA3Kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750064035; 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=LiTvZLyUOUkqjL77rBvG6CgZH4yFcUUgYpDApZWXeWs=; b=l2y1uDMep935ACpcl41o6ACalw7mHTQDYbMChOaKbhM3Aqx9hdFvVRrQSccSeOihbFhA9z I17bpifjvTu8powhnBFMlztckZbpCXHaF5vt6b3b27L8A2V4Nj/HJBm2XvyDH0rqpbq/Eg Pl/9X5Fpa8RGNJQo6IrE95CdhsrUvS+i7hcIxT/M0giEoIed0FEjUie9RpxMym53LlYOha PVJTsGuikcbom2R8ca1ej/OI7IHLUzFQsqulVWhAjo2mMOImdw64y3HrmII0TOJpak0ji4 WNkksJX0JLjHL/Mcio0iTE0UiHlwKxsmGFrmT3W4MAi25LG0SrSYQdX2lxF2bw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750064035; a=rsa-sha256; cv=none; b=hfacZ3TMl9On/qbjEI9tq9Fh0ij5zCJk8owuc52xBhVOGVGtMrgUBaIkEnSEdcsO91U35/ u/2MtPHqyfqvVYJ2G8s0gpQIW9Kk3Scss99xpWg+tXvEKcz0z7zr4tk5rDohm77yVjXFMH V/4E9x/RLiagdqtZ6x4A5VSzFjVbegEvXD/u4drPbLlRcBT1gneYuMvCUhAhnerppWp+am EdgsdRAiiRJ2qkHqWqKScCWMcs+Iet0F0essJX356lOKjaEW4l9yzbRuhuwDIa5nxAtVGh 9qivPcSO2l9NUYLb5rKCnbHOHu8JcCBImEwouaAKsHoWDrOY2b+Tpt8hgkOoIQ== 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 4bLP1b0lvxzrvc; Mon, 16 Jun 2025 08:53:55 +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 55G8rtv3043027; Mon, 16 Jun 2025 08:53:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55G8rtl7043024; Mon, 16 Jun 2025 08:53:55 GMT (envelope-from git) Date: Mon, 16 Jun 2025 08:53:55 GMT Message-Id: <202506160853.55G8rtl7043024@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: a073aed45e9d - stable/14 - timeout(1): fix test after improvement of error messages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a073aed45e9d5f5b955e33301286874111df7add Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a073aed45e9d5f5b955e33301286874111df7add commit a073aed45e9d5f5b955e33301286874111df7add Author: Baptiste Daroussin AuthorDate: 2025-04-16 19:26:00 +0000 Commit: Konstantin Belousov CommitDate: 2025-06-16 08:51:51 +0000 timeout(1): fix test after improvement of error messages (cherry picked from commit 672ee7eb800c43a9e29c6e38e7e9927c40cb2477) --- bin/timeout/tests/timeout_test.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/timeout/tests/timeout_test.sh b/bin/timeout/tests/timeout_test.sh index 2a8e0112b97c..d08f6c01e067 100644 --- a/bin/timeout/tests/timeout_test.sh +++ b/bin/timeout/tests/timeout_test.sh @@ -126,31 +126,31 @@ invalid_timeout_body() { atf_check \ -o empty \ - -e inline:"timeout: invalid duration\n" \ + -e inline:"timeout: duration is not a number\n" \ -s exit:125 \ timeout invalid sleep 0 atf_check \ -o empty \ - -e inline:"timeout: invalid duration\n" \ + -e inline:"timeout: duration is not a number\n" \ -s exit:125 \ timeout --kill-after=invalid 1 sleep 0 atf_check \ -o empty \ - -e inline:"timeout: invalid duration\n" \ + -e inline:"timeout: duration unit suffix invalid\n" \ -s exit:125 \ timeout 42D sleep 0 atf_check \ -o empty \ - -e inline:"timeout: invalid duration\n" \ + -e inline:"timeout: duration out of range\n" \ -s exit:125 \ timeout 999999999999999999999999999999999999999999999999999999999999d sleep 0 atf_check \ -o empty \ - -e inline:"timeout: invalid duration\n" \ + -e inline:"timeout: duration out of range\n" \ -s exit:125 \ timeout 2.34e+5d sleep 0 }