git: 4dbe268d2e7a - main - traceroute tests: fix the test when SCTP is supported
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 16 May 2025 16:25:41 UTC
The branch main has been updated by ivy:
URL: https://cgit.FreeBSD.org/src/commit/?id=4dbe268d2e7ad4f1172a174a3c55f0fdff3aaa99
commit 4dbe268d2e7ad4f1172a174a3c55f0fdff3aaa99
Author: Lexi Winter <ivy@FreeBSD.org>
AuthorDate: 2025-05-16 15:29:51 +0000
Commit: Lexi Winter <ivy@FreeBSD.org>
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