From nobody Thu Nov 10 17:02:28 2022 X-Original-To: dev-commits-src-all@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 4N7SnJ64g1z4dN8m; Thu, 10 Nov 2022 17:02:28 +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 4N7SnJ4Wrzz3hgs; Thu, 10 Nov 2022 17:02:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668099748; 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=UXl/VURb6qBQgFafTy+w3gYAT2fwE3nLEEElzp7edvE=; b=Sd1KCe1B0cVltlzdDnOOGn46TIe4m44Fv+++dpf9VL3XnSXsYF11mR6rHMrMKeTR4iO8DN Dsdsaop3BtMgtLMy+lqLSSPl+HVmx7EiuriZHL+V2ohd/4u9Bfuf6eU36NB/VyRCbr8jAU XsoPf/eaqe9RcVqP2jiG3Ec555kCrdmMaHaj+JajTZqsGqlMN4/D6mWwfvLPix8jXSDUY7 GBjdkezSsfSVuB1pDcCAf75L/6k3RP+w8MyXAAawUjARBEFzHyC1/STpCYzIxgyJUwhIyl SV4mxHuQBrWoS0LJ3TAT2BHfhvHXzBrr8FU1RKLdKugQtS0R0WJ0UJUqKbceJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668099748; 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=UXl/VURb6qBQgFafTy+w3gYAT2fwE3nLEEElzp7edvE=; b=vLtYdWLqwFIFnHMF++/srSk+UxUCf9jW5qBlNcPwAj6HmSo3iIpbBg19qFUK/c774ojzMd 6sPfA2cl/GM3xA3CKFEH8hA/8pF/gbUQrBvq82yr+/Yept2lzlQlyRylBDa/XMXszmMdC0 BskzvB4KUDTqot+zB4Ju8G7wOUXuPAp7ejOekKDswJlt7gLD+Ru1VT7l203ZjTNceEjw5A /wVMyKzoDOI6WneOK3wbEs2RyXQznwUPuAYwx7l8ugKsc+PiVCARZVpnSmMzjWKtp7rMQB 7PCmVNU2ggPZanJRmAVs7Hnko425y7zsR4PZiXBdRumaKzBUrBg2PVB9YDUBSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668099748; a=rsa-sha256; cv=none; b=Hlv0wn4/wqYQtaqe9dMrWGjelnkPHuj4IusJQWE/U03K4F462pfBgYRCkfm7XMZkjlpki6 oiLobNyZWFxG3fUVfVxeNzgMy4u9TAB0o5PhfBZt7Ma5MgVYkFb+L8tyPrP6PRIcqAsR4A Z0QgnZvSFtUNYbTmhpwh1sV6Y/+pHJ8eAApKToP9A1RdKZPevn4+8GwF/nNhemS5C2mTjp i9hKqPiFMds8NcTL8H0kUzOvxR6hJ3ALY7XlLpCT83KVAOZ7rN4n5clcvjkSR1x/N9kjxK g3pDb/zc2tXaKkRL+2YY2dA+Aj9b18k+7U56YQ3qkYJj45PqQu4fHbGC8OBAAQ== 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 4N7SnJ3dkMz181V; Thu, 10 Nov 2022 17:02:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AAH2SSp016275; Thu, 10 Nov 2022 17:02:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AAH2Swv016274; Thu, 10 Nov 2022 17:02:28 GMT (envelope-from git) Date: Thu, 10 Nov 2022 17:02:28 GMT Message-Id: <202211101702.2AAH2Swv016274@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ab1627bb2bd5 - stable/13 - ping_test: Code cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: ab1627bb2bd5cf3c6c54c55ecbe587eb67a003ee Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ab1627bb2bd5cf3c6c54c55ecbe587eb67a003ee commit ab1627bb2bd5cf3c6c54c55ecbe587eb67a003ee Author: Jose Luis Duran AuthorDate: 2022-10-31 08:23:33 +0000 Commit: Mark Johnston CommitDate: 2022-11-10 17:01:58 +0000 ping_test: Code cleanup Mostly style fixes. Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D37248 (cherry picked from commit fcae0b54d1339e2bafc52e419023297773d9b241) --- sbin/ping/tests/ping_test.sh | 193 ++++++++++++++++++++++++------------------- 1 file changed, 107 insertions(+), 86 deletions(-) diff --git a/sbin/ping/tests/ping_test.sh b/sbin/ping/tests/ping_test.sh index 7f11af7e9818..55456a5c86ba 100644 --- a/sbin/ping/tests/ping_test.sh +++ b/sbin/ping/tests/ping_test.sh @@ -27,124 +27,145 @@ # # $FreeBSD$ -require_ipv4() { - if ! getaddrinfo -f inet localhost 1>/dev/null 2>&1; then - atf_skip "IPv4 is not configured" - fi -} -require_ipv6() { - if ! getaddrinfo -f inet6 localhost 1>/dev/null 2>&1; then - atf_skip "IPv6 is not configured" - fi +require_ipv4() +{ + if ! getaddrinfo -f inet localhost 1>/dev/null 2>&1; then + atf_skip "IPv4 is not configured" + fi +} +require_ipv6() +{ + if ! getaddrinfo -f inet6 localhost 1>/dev/null 2>&1; then + atf_skip "IPv6 is not configured" + fi } atf_test_case ping_c1_s56_t1 -ping_c1_s56_t1_head() { - atf_set "descr" "Stop after receiving 1 ECHO_RESPONSE packet" +ping_c1_s56_t1_head() +{ + atf_set "descr" "Stop after receiving 1 ECHO_RESPONSE packet" } -ping_c1_s56_t1_body() { - require_ipv4 - atf_check -s exit:0 -o save:std.out -e empty \ - ping -4 -c 1 -s 56 -t 1 localhost - check_ping_statistics std.out $(atf_get_srcdir)/ping_c1_s56_t1.out +ping_c1_s56_t1_body() +{ + require_ipv4 + atf_check -s exit:0 -o save:std.out -e empty \ + ping -4 -c 1 -s 56 -t 1 localhost + check_ping_statistics std.out $(atf_get_srcdir)/ping_c1_s56_t1.out } atf_test_case ping_c1_s56_t1_S127 -ping_c1_s56_t1_S127_head() { - atf_set "descr" "Check that ping -S 127.0.0.1 localhost succeeds" -} -ping_c1_s56_t1_S127_body() { - require_ipv4 - require_ipv6 - atf_check -s exit:0 -o save:std.out -e empty \ - ping -c 1 -s 56 -t 1 -S 127.0.0.1 localhost - check_ping_statistics std.out $(atf_get_srcdir)/ping_c1_s56_t1_S127.out +ping_c1_s56_t1_S127_head() +{ + atf_set "descr" "Check that ping -S 127.0.0.1 localhost succeeds" +} +ping_c1_s56_t1_S127_body() +{ + require_ipv4 + require_ipv6 + atf_check -s exit:0 -o save:std.out -e empty \ + ping -c 1 -s 56 -t 1 -S 127.0.0.1 localhost + check_ping_statistics std.out $(atf_get_srcdir)/ping_c1_s56_t1_S127.out } atf_test_case ping_6_c1_s8_t1 -ping_6_c1_s8_t1_head() { - atf_set "descr" "Stop after receiving 1 ECHO_RESPONSE packet" +ping_6_c1_s8_t1_head() +{ + atf_set "descr" "Stop after receiving 1 ECHO_RESPONSE packet" } -ping_6_c1_s8_t1_body() { - require_ipv6 - atf_check -s exit:0 -o save:std.out -e empty \ - ping -6 -c 1 -s 8 -t 1 localhost - check_ping_statistics std.out $(atf_get_srcdir)/ping_6_c1_s8_t1.out +ping_6_c1_s8_t1_body() +{ + require_ipv6 + atf_check -s exit:0 -o save:std.out -e empty \ + ping -6 -c 1 -s 8 -t 1 localhost + check_ping_statistics std.out $(atf_get_srcdir)/ping_6_c1_s8_t1.out } atf_test_case ping_c1_s8_t1_S1 -ping_c1_s8_t1_S1_head() { - atf_set "descr" "Check that ping -S ::1 localhost succeeds" -} -ping_c1_s8_t1_S1_body() { - require_ipv4 - require_ipv6 - atf_check -s exit:0 -o save:std.out -e empty \ - ping -c 1 -s 8 -t 1 -S ::1 localhost - check_ping_statistics std.out $(atf_get_srcdir)/ping_c1_s8_t1_S1.out +ping_c1_s8_t1_S1_head() +{ + atf_set "descr" "Check that ping -S ::1 localhost succeeds" +} +ping_c1_s8_t1_S1_body() +{ + require_ipv4 + require_ipv6 + atf_check -s exit:0 -o save:std.out -e empty \ + ping -c 1 -s 8 -t 1 -S ::1 localhost + check_ping_statistics std.out $(atf_get_srcdir)/ping_c1_s8_t1_S1.out } atf_test_case ping6_c1_s8_t1 -ping6_c1_s8_t1_head() { - atf_set "descr" "Use IPv6 when invoked as ping6" +ping6_c1_s8_t1_head() +{ + atf_set "descr" "Use IPv6 when invoked as ping6" } -ping6_c1_s8_t1_body() { - require_ipv6 - atf_check -s exit:0 -o save:std.out -e empty \ - ping6 -c 1 -s 8 -t 1 localhost - check_ping_statistics std.out $(atf_get_srcdir)/ping_6_c1_s8_t1.out +ping6_c1_s8_t1_body() +{ + require_ipv6 + atf_check -s exit:0 -o save:std.out -e empty \ + ping6 -c 1 -s 8 -t 1 localhost + check_ping_statistics std.out $(atf_get_srcdir)/ping_6_c1_s8_t1.out } -ping_c1t6_head() { - atf_set "descr" "-t6 is not interpreted as -t -6 by ping" +ping_c1t6_head() +{ + atf_set "descr" "-t6 is not interpreted as -t -6 by ping" } -ping_c1t6_body() { - require_ipv4 - atf_check -s exit:0 -o ignore -e empty ping -c1 -t6 127.0.0.1 +ping_c1t6_body() +{ + require_ipv4 + atf_check -s exit:0 -o ignore -e empty ping -c1 -t6 127.0.0.1 } -ping6_c1t4_head() { - atf_set "descr" "-t4 is not interpreted as -t -4 by ping6" +ping6_c1t4_head() +{ + atf_set "descr" "-t4 is not interpreted as -t -4 by ping6" } -ping6_c1t4_body() { - require_ipv6 - atf_check -s exit:0 -o ignore -e empty ping6 -c1 -t4 ::1 +ping6_c1t4_body() +{ + require_ipv6 + atf_check -s exit:0 -o ignore -e empty ping6 -c1 -t4 ::1 } -ping_46_head() { - atf_set "descr" "-4 and -6 may not be used together" +ping_46_head() +{ + atf_set "descr" "-4 and -6 may not be used together" } -ping_46_body() { - atf_check -s exit:1 -e ignore ping -4 -6 +ping_46_body() +{ + atf_check -s exit:1 -e ignore ping -4 -6 } -ping6_46_head() { - atf_set "descr" "-4 and -6 may not be used together" +ping6_46_head() +{ + atf_set "descr" "-4 and -6 may not be used together" } -ping6_46_body() { - atf_check -s exit:1 -e ignore ping6 -4 -6 +ping6_46_body() +{ + atf_check -s exit:1 -e ignore ping6 -4 -6 } - -atf_init_test_cases() { - atf_add_test_case ping_c1_s56_t1 - atf_add_test_case ping_c1_s56_t1_S127 - atf_add_test_case ping_6_c1_s8_t1 - atf_add_test_case ping_c1_s8_t1_S1 - atf_add_test_case ping6_c1_s8_t1 - atf_add_test_case ping_c1t6 - atf_add_test_case ping6_c1t4 - atf_add_test_case ping_46 - atf_add_test_case ping6_46 +atf_init_test_cases() +{ + atf_add_test_case ping_c1_s56_t1 + atf_add_test_case ping_c1_s56_t1_S127 + atf_add_test_case ping_6_c1_s8_t1 + atf_add_test_case ping_c1_s8_t1_S1 + atf_add_test_case ping6_c1_s8_t1 + atf_add_test_case ping_c1t6 + atf_add_test_case ping6_c1t4 + atf_add_test_case ping_46 + atf_add_test_case ping6_46 } -check_ping_statistics() { - sed -e 's/0.[0-9]\{3\}//g' \ - -e 's/[1-9][0-9]*.[0-9]\{3\}//g' \ - -e 's/localhost ([0-9]\{1,3\}\(\.[0-9]\{1,3\}\)\{1,3\})/localhost/' \ - -e 's/from [0-9]\{1,3\}\(\.[0-9]\{1,3\}\)\{1,3\}/from/' \ - -e 's/ttl=[0-9][0-9]*/ttl=/' \ - -e 's/hlim=[0-9][0-9]*/hlim=/' \ - "$1" >"$1".filtered - atf_check -s exit:0 diff -u "$1".filtered "$2" +check_ping_statistics() +{ + sed -e 's/0.[0-9]\{3\}//g' \ + -e 's/[1-9][0-9]*.[0-9]\{3\}//g' \ + -e 's/localhost ([0-9]\{1,3\}\(\.[0-9]\{1,3\}\)\{1,3\})/localhost/' \ + -e 's/from [0-9]\{1,3\}\(\.[0-9]\{1,3\}\)\{1,3\}/from/' \ + -e 's/ttl=[0-9][0-9]*/ttl=/' \ + -e 's/hlim=[0-9][0-9]*/hlim=/' \ + "$1" >"$1".filtered + atf_check -s exit:0 diff -u "$1".filtered "$2" }