From nobody Tue Jul 7 20:57:50 2026 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 4gvtpk4Q05z6kTD7 for ; Tue, 07 Jul 2026 20:57:50 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gvtpk1V4Wz3lmg for ; Tue, 07 Jul 2026 20:57:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783457870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ndz6XJ9BIhiQX5rfGGWhgbceukHJ0WM02xqyOpLJ4YU=; b=CwlMYt1FbDydIYQ5QANb2uRxf+MectXzM2Ul041KLST0lmC58DnjqqlQZQoZjoX3x3ToE0 PUdMBoKO/NVNRlMwGPDX2PsyMScqVTsDvOYqr7dAA6fzgN1hebjRNLIBMPC/kZ42kl4DaT fCPXxFtEgrRVE7bF6qOuf3ljb5eXZ0oq7kBjeCHnP51wocwgJ0rMI3wFpqTghJWTuUQjx6 64eYyuXwmj4tO61+VPjHjwEPrUz/+U+OGTkoDlKe6cs9cOr4isZNfbfu0N1k+5PiKwY8s5 y0wpw4oaz3Ri1R14cseLvBqtFtFBPqUsMYiOewQrZCOxXUzAHlKal/DngVtpFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783457870; a=rsa-sha256; cv=none; b=G0lurJXqvOJxe/6PLC8/JJ16N2Q06Wk+8frO8f8QM3ZPOB4ymMIn1EIJqCZt70nh4oc0qX LojG4GqUhikzNxzJVPm8cS5e7a5OZ2ipL6s0lZTHuAl2PsYwza9q/zZAp9GnBcABoeLoSG 35xvoS0BMSiLV9PJ2rBMLl/CEkhyIWTZdWMJxmYR6A8c5fh+el1MpxZi520XLZjtqdH6mK t4CZ74m3WK6F8KNtFTfSYVuKmIkjR1CjFOh2aOefjee1RoWT+CCFhAkJhsfMTbvc5ic9PE Iz1vn7YBAkaVQ96lsNG+UA0N9hXNZgCVvQbHTIOenJvYs9a4+2oLE7O+S/ZS5Q== 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=1783457870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ndz6XJ9BIhiQX5rfGGWhgbceukHJ0WM02xqyOpLJ4YU=; b=SB59swJ5nh2qE9Y4tvtYdyZEQ1gyyTum27BrKO0MbrPsO5gQJIAhU/hrUXXsSZkG4YAjR4 g4sg0UizfW9pfe/awoH3S3QM2HUCzob6XXEU+Ln3PmJ7TF5mVozMSeDvOszYOoRTxKm8+a r5k+zxy5m5KyCBNv8UTuk1AEXQso1D8LDIk7EzagbSAotFbmKIaCT7g+reflian/D/iNZD xGbF2hbdmY4hyfBjGRocgcP/gc3g3NSr5xzz3lNmvxYuEX3Db2bsGs8wLcLm2VFP976rUo HwIuyxFL3Z+XuB/HSLM6ZaH/r14yLKiRy/v9dZ6h3W+i5NNzAVsUhLa8bSYewQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gvtpk0XMhzrsK for ; Tue, 07 Jul 2026 20:57:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18e9b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Jul 2026 20:57:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: c6ed84f27bec - stable/15 - ping: Fix bell char ordering in -A test cases 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c6ed84f27bec74b54bfc1548f8225687bfd9646c Auto-Submitted: auto-generated Date: Tue, 07 Jul 2026 20:57:50 +0000 Message-Id: <6a4d684e.18e9b.ef09848@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c6ed84f27bec74b54bfc1548f8225687bfd9646c commit c6ed84f27bec74b54bfc1548f8225687bfd9646c Author: Siva Mahadevan AuthorDate: 2026-06-26 12:22:57 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-07-07 07:07:04 +0000 ping: Fix bell char ordering in -A test cases Previously, these tests expected the bell chars to arrive before the initial status line. This appeared to be ok because ping(8) incorrectly mixed unbuffered and buffered writes by using printf(3) calls for the initial status, but direct write(2) calls for the bell chars. 141bb85798 revealed that the test's assertions only passed because the buffered writes did not get flushed before the direct writes in the test runs. 8bda488114f3 fixed ping(8) to use POSIX stdio buffered writes in all cases and guarantee a deterministic output ordering to stdout observers. This patch fixes the test to match the correct ordering. Reviewed by: des Sponsored by: The FreeBSD Foundation (cherry picked from commit 7ac9995a062ff9f78b634fe403e6a313f5637945) (cherry picked from commit 5b8c28adb829b50fb8ac065637fa99f717858bab) (cherry picked from commit f7f916d755fe5b48a2a68a937beea770b7bafa95) --- sbin/ping/tests/test_ping.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sbin/ping/tests/test_ping.py b/sbin/ping/tests/test_ping.py index fdf9c875329c..88164c2ab816 100644 --- a/sbin/ping/tests/test_ping.py +++ b/sbin/ping/tests/test_ping.py @@ -431,8 +431,8 @@ round-trip min/avg/max/stddev = /// ms "args": "ping -A -c3 192.0.2.2", "returncode": 2, "stdout": """\ -\x07\x07PING 192.0.2.2 (192.0.2.2): 56 data bytes - +PING 192.0.2.2 (192.0.2.2): 56 data bytes +\x07\x07 --- 192.0.2.2 ping statistics --- 3 packets transmitted, 0 packets received, 100.0% packet loss """, @@ -463,8 +463,8 @@ round-trip min/avg/max/stddev = /// ms "args": "ping -A -c3 2001:db8::2", "returncode": 2, "stdout": """\ -\x07\x07PING(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2 - +PING(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2 +\x07\x07 --- 2001:db8::2 ping statistics --- 3 packets transmitted, 0 packets received, 100.0% packet loss """,