From nobody Fri May 16 16:25:41 2025 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 4ZzXWB0N6dz5vyDQ; Fri, 16 May 2025 16:25:42 +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 4ZzXW96fh2z3gt9; Fri, 16 May 2025 16:25:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747412742; 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=9K6Ztnh5uRHPYOZ02hSPG7LTfY9+MfztwaJMQF+LkRM=; b=RTME4Nsw4+SSOIYshkFn3317eHVuvOY5CxfGHpOoAbrENQfAALqSnCKhtVjSq46xhii7pe e5ykuvsw1NdOIn2jEQL073FqMRqobQnkDcTAWxoKIKqzoG2tVGuzjDdN47D3UF3w9olrqN yskc/UPpPulPpNd29iknm9WZhlXUlmY24CCRiDAKSVAUMrDHf0+591WX1bHOCzGerpDOlo GPdRsoEhH+qyZFcI2D5B5zMLTdDlN//g1LUA2rD5y7qeS3JF4EaB3QFSXvmooUKfTB+pjL mjpFGk7P/lcNOG0Il+0yYz32mZb36LITADu6sCJmGYAY2M1L7qDxOi3UhA4VMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747412742; 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=9K6Ztnh5uRHPYOZ02hSPG7LTfY9+MfztwaJMQF+LkRM=; b=GOkmAm/y4xm6Ovef8ZsK56YJfW4i0sfvaBxX5rfYyJ4YQCG3W6doOzAYhFeK+PsOipPTHA EtTgJGhPgDQqRDvmxx0gOMLszMkuFXpXqzbRmyIsksXWbQQB8amvWOvFQCZCCJBDdyh4n/ z++BsDasL013EUEBm06DXPlBENETMPNR4uFRWXX471Ec+ngcNi/wEuSizY8ng9hLo5BWov cM5rhY3Lb3ZJfF4QDBzHubsWOIlCC2Z/yDQi5vXBkAd4UI3RrAiHRv0CNbjphqdbKD5hi1 3TuVQdRfbOnODha9YHqOj+hzSEWpFe0U05++sm7s2deEga38tGQWJkTGs6AxMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747412742; a=rsa-sha256; cv=none; b=rZtnzgvGtXnGIan5t0ojzL5Ei3VwMAnU0laCGxw6Z+nP0N4qsDDfXMRctRcWgZMoMCFV4G F7LD4gSj7NVf3ZHxvWCeGcMCUmpv2PGbx+PEpyl5QI+bFJ1yH86Qv9aIqLyYrN1KfiwYh3 DnYnquwcT14IGvNd8nCGjWJfCa1nbw9g6C90DbSu+O/0of87ayNjTT7kzAOOLIX7L8YHHt IA3DQyydPqdpCQXh0zL1jn0ZmmF8IJpFkxseO2ZlF4PTqPD5nY/JVI6N8qnPus9E/9h8sx LFnypTMQzM68TjFuD5E85LqUBdNaiTtPxs47kJYb7ld8RBeAKuOTsUwC/98rCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZzXW96Dxlz19DK; Fri, 16 May 2025 16:25:41 +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 54GGPfLU084360; Fri, 16 May 2025 16:25:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54GGPfcB084357; Fri, 16 May 2025 16:25:41 GMT (envelope-from git) Date: Fri, 16 May 2025 16:25:41 GMT Message-Id: <202505161625.54GGPfcB084357@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 4dbe268d2e7a - main - traceroute tests: fix the test when SCTP is supported 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4dbe268d2e7ad4f1172a174a3c55f0fdff3aaa99 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=4dbe268d2e7ad4f1172a174a3c55f0fdff3aaa99 commit 4dbe268d2e7ad4f1172a174a3c55f0fdff3aaa99 Author: Lexi Winter AuthorDate: 2025-05-16 15:29:51 +0000 Commit: Lexi Winter CommitDate: 2025-05-16 16:25:14 +0000 traceroute tests: fix the test when SCTP is supported The SCTP test assumes a default system configuration where SCTP is not supported, so the probe packet returns an ICMP error which is displayed as a !P response. If SCTP is supported, then something else is returned instead (depending on exactly what probe we sent, but not an ICMP error) and the test fails. Since we already check the correct probes are sent using tcpdump, remove the match for the second hop entirely. Reported by: Jenkins Reviewed by: des Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D50336 --- usr.sbin/traceroute/tests/traceroute_test.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/usr.sbin/traceroute/tests/traceroute_test.sh b/usr.sbin/traceroute/tests/traceroute_test.sh index 6243db14bc8e..268e0bd58b5b 100755 --- a/usr.sbin/traceroute/tests/traceroute_test.sh +++ b/usr.sbin/traceroute/tests/traceroute_test.sh @@ -293,8 +293,6 @@ ipv4_sctp_body() atf_check -s exit:0 \ -e match:"^traceroute to ${LINK_TRDST_TRDST}" \ -o match:"^ 1 ${LINK_TRSRC_TRRTR}" \ - -o match:"^ 2 ${LINK_TRDST_TRDST} .* !P" \ - -o not-match:"^ 3" \ jexec trsrc traceroute $TR_FLAGS -Psctp ${LINK_TRDST_TRDST} stop_tcpdump @@ -310,8 +308,6 @@ ipv4_sctp_body() atf_check -s exit:0 \ -e match:"^traceroute to ${LINK_TRDST_TRDST}" \ -o match:"^ 1 ${LINK_TRSRC_TRRTR}" \ - -o match:"^ 2 ${LINK_TRDST_TRDST} .* !P" \ - -o not-match:"^ 3" \ jexec trsrc traceroute $TR_FLAGS -Psctp ${LINK_TRDST_TRDST} 128 stop_tcpdump @@ -327,8 +323,6 @@ ipv4_sctp_body() atf_check -s exit:0 \ -e match:"^traceroute to ${LINK_TRDST_TRDST}" \ -o match:"^ 1 ${LINK_TRSRC_TRRTR}" \ - -o match:"^ 2 ${LINK_TRDST_TRDST} .* !P" \ - -o not-match:"^ 3" \ jexec trsrc traceroute $TR_FLAGS -Psctp -e -p 40000 ${LINK_TRDST_TRDST} stop_tcpdump