From nobody Thu Nov 3 14:39:52 2022 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 4N35y05SSlz4h8wf; Thu, 3 Nov 2022 14:39:52 +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 4N35y04cq2z3g8c; Thu, 3 Nov 2022 14:39:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667486392; 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=1BYAmfpjPgHpxgwuPMjA78vPZXmLQZI66Q2TjpOXqfk=; b=l+czrh020J299LBHPBxAYJccqPgXgsAlFLEspSFjrJawCWjx0/9BhVKKuVztkMIFUCGEi2 ttCCFrhCiyrLWV3cinduml031H6fvrBEy/ckscq0So4sB6BbZpt7+r6/bqo2I/xT/jYNaf YoUD+3NWHctAHottIscOQ+8Ek3Y1EJfPCQjl3Zj+kTuvke9cODqNo7btlkI9OsDgKvkdsR NK+Gfjg40+cy6RlRBLYpEsLwO+TXLpKOZM5zpG06g6JPEAHAEA7osstW1A4Cq9orfTSbPv Nx1QLRWLj9hKCDO67lOF3p1xQsimugy2jD7VIMQi4hr5pkgwcyconRFeIFy5gQ== 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 4N35y03ZqYzfYx; Thu, 3 Nov 2022 14:39:52 +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 2A3EdqEP089533; Thu, 3 Nov 2022 14:39:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A3EdqGN089532; Thu, 3 Nov 2022 14:39:52 GMT (envelope-from git) Date: Thu, 3 Nov 2022 14:39:52 GMT Message-Id: <202211031439.2A3EdqGN089532@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: fcae0b54d133 - main - ping_test: Code cleanup 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: fcae0b54d1339e2bafc52e419023297773d9b241 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667486392; 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=1BYAmfpjPgHpxgwuPMjA78vPZXmLQZI66Q2TjpOXqfk=; b=Gv0wzs3e6Fib9GmS1yWM151wvkfbwC2mH0A3zJX38dqxyA5AUAzTOU7jxqKx/EEqIfcLm2 HFOwj/V9L6y1OQhxPmu638/ZokA/TqCuAU6V6kA5ru0pp0JwI46DJVXAOOw3J/Mp0zYjXw QxuZj3+xO81hZujfWnsrm8O5oJIZN5G5F/VvD/NSWwfzuRcsG4HNSBkMvSkP6ovHIo4kfs l+y7BqctAzOFHj2WkfOSslQifvkGbKYlkZfQBC8ME3PYJBewgigcBEl2Efnk/WG1bnrgCr sa1DiDsUW7I1J0767CEODrQIGmSh5/x+ip0jiLHu3CHldepCA6f9RGE7UVCq+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667486392; a=rsa-sha256; cv=none; b=ZVTmvSDfluAMesi3PAvanHjj6kzHH8Rfo+89/L9b8eQ0QuOmXFwwz2mNYBrTuq8MQwTqlr MCxttkgVeyM14947RXuMTJc3ub9l+MhBlu/niHSsmmggoKpvy6RVi6japZgqms7Csd0LRD ld42KkFbWXqNKhqD6YnwWt+j62LjUZvRj/jqfxME0yOcomwiudHxQR1c8RAhOMfMHQ+uTP fFel4elRe9WrVkeABHox+5CgExMdeZuCSVWQut7LlfF42ry/Xo9qLZqjfNfcY03SpC9OKu aKiwUlM0jS2nts8O7rPFvexRSpXe75Tq+WNTdqU3PHYfXBr2bcKm9z4BOrp9LQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fcae0b54d1339e2bafc52e419023297773d9b241 commit fcae0b54d1339e2bafc52e419023297773d9b241 Author: Jose Luis Duran AuthorDate: 2022-10-31 08:23:33 +0000 Commit: Mark Johnston CommitDate: 2022-11-03 14:39:32 +0000 ping_test: Code cleanup Mostly style fixes. Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D37248 --- 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" }