ping_test: Code cleanup
Mostly style fixes. Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D37248
This commit is contained in:
Jose Luis Duran
Mark Johnston
parent
909e2e1b6c
commit
fcae0b54d1
@ -27,124 +27,145 @@
|
|||||||
#
|
#
|
||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
require_ipv4() {
|
require_ipv4()
|
||||||
if ! getaddrinfo -f inet localhost 1>/dev/null 2>&1; then
|
{
|
||||||
atf_skip "IPv4 is not configured"
|
if ! getaddrinfo -f inet localhost 1>/dev/null 2>&1; then
|
||||||
fi
|
atf_skip "IPv4 is not configured"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
require_ipv6() {
|
require_ipv6()
|
||||||
if ! getaddrinfo -f inet6 localhost 1>/dev/null 2>&1; then
|
{
|
||||||
atf_skip "IPv6 is not configured"
|
if ! getaddrinfo -f inet6 localhost 1>/dev/null 2>&1; then
|
||||||
fi
|
atf_skip "IPv6 is not configured"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
atf_test_case ping_c1_s56_t1
|
atf_test_case ping_c1_s56_t1
|
||||||
ping_c1_s56_t1_head() {
|
ping_c1_s56_t1_head()
|
||||||
atf_set "descr" "Stop after receiving 1 ECHO_RESPONSE packet"
|
{
|
||||||
|
atf_set "descr" "Stop after receiving 1 ECHO_RESPONSE packet"
|
||||||
}
|
}
|
||||||
ping_c1_s56_t1_body() {
|
ping_c1_s56_t1_body()
|
||||||
require_ipv4
|
{
|
||||||
atf_check -s exit:0 -o save:std.out -e empty \
|
require_ipv4
|
||||||
ping -4 -c 1 -s 56 -t 1 localhost
|
atf_check -s exit:0 -o save:std.out -e empty \
|
||||||
check_ping_statistics std.out $(atf_get_srcdir)/ping_c1_s56_t1.out
|
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
|
atf_test_case ping_c1_s56_t1_S127
|
||||||
ping_c1_s56_t1_S127_head() {
|
ping_c1_s56_t1_S127_head()
|
||||||
atf_set "descr" "Check that ping -S 127.0.0.1 localhost succeeds"
|
{
|
||||||
|
atf_set "descr" "Check that ping -S 127.0.0.1 localhost succeeds"
|
||||||
}
|
}
|
||||||
ping_c1_s56_t1_S127_body() {
|
ping_c1_s56_t1_S127_body()
|
||||||
require_ipv4
|
{
|
||||||
require_ipv6
|
require_ipv4
|
||||||
atf_check -s exit:0 -o save:std.out -e empty \
|
require_ipv6
|
||||||
ping -c 1 -s 56 -t 1 -S 127.0.0.1 localhost
|
atf_check -s exit:0 -o save:std.out -e empty \
|
||||||
check_ping_statistics std.out $(atf_get_srcdir)/ping_c1_s56_t1_S127.out
|
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
|
atf_test_case ping_6_c1_s8_t1
|
||||||
ping_6_c1_s8_t1_head() {
|
ping_6_c1_s8_t1_head()
|
||||||
atf_set "descr" "Stop after receiving 1 ECHO_RESPONSE packet"
|
{
|
||||||
|
atf_set "descr" "Stop after receiving 1 ECHO_RESPONSE packet"
|
||||||
}
|
}
|
||||||
ping_6_c1_s8_t1_body() {
|
ping_6_c1_s8_t1_body()
|
||||||
require_ipv6
|
{
|
||||||
atf_check -s exit:0 -o save:std.out -e empty \
|
require_ipv6
|
||||||
ping -6 -c 1 -s 8 -t 1 localhost
|
atf_check -s exit:0 -o save:std.out -e empty \
|
||||||
check_ping_statistics std.out $(atf_get_srcdir)/ping_6_c1_s8_t1.out
|
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
|
atf_test_case ping_c1_s8_t1_S1
|
||||||
ping_c1_s8_t1_S1_head() {
|
ping_c1_s8_t1_S1_head()
|
||||||
atf_set "descr" "Check that ping -S ::1 localhost succeeds"
|
{
|
||||||
|
atf_set "descr" "Check that ping -S ::1 localhost succeeds"
|
||||||
}
|
}
|
||||||
ping_c1_s8_t1_S1_body() {
|
ping_c1_s8_t1_S1_body()
|
||||||
require_ipv4
|
{
|
||||||
require_ipv6
|
require_ipv4
|
||||||
atf_check -s exit:0 -o save:std.out -e empty \
|
require_ipv6
|
||||||
ping -c 1 -s 8 -t 1 -S ::1 localhost
|
atf_check -s exit:0 -o save:std.out -e empty \
|
||||||
check_ping_statistics std.out $(atf_get_srcdir)/ping_c1_s8_t1_S1.out
|
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
|
atf_test_case ping6_c1_s8_t1
|
||||||
ping6_c1_s8_t1_head() {
|
ping6_c1_s8_t1_head()
|
||||||
atf_set "descr" "Use IPv6 when invoked as ping6"
|
{
|
||||||
|
atf_set "descr" "Use IPv6 when invoked as ping6"
|
||||||
}
|
}
|
||||||
ping6_c1_s8_t1_body() {
|
ping6_c1_s8_t1_body()
|
||||||
require_ipv6
|
{
|
||||||
atf_check -s exit:0 -o save:std.out -e empty \
|
require_ipv6
|
||||||
ping6 -c 1 -s 8 -t 1 localhost
|
atf_check -s exit:0 -o save:std.out -e empty \
|
||||||
check_ping_statistics std.out $(atf_get_srcdir)/ping_6_c1_s8_t1.out
|
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() {
|
ping_c1t6_head()
|
||||||
atf_set "descr" "-t6 is not interpreted as -t -6 by ping"
|
{
|
||||||
|
atf_set "descr" "-t6 is not interpreted as -t -6 by ping"
|
||||||
}
|
}
|
||||||
ping_c1t6_body() {
|
ping_c1t6_body()
|
||||||
require_ipv4
|
{
|
||||||
atf_check -s exit:0 -o ignore -e empty ping -c1 -t6 127.0.0.1
|
require_ipv4
|
||||||
|
atf_check -s exit:0 -o ignore -e empty ping -c1 -t6 127.0.0.1
|
||||||
}
|
}
|
||||||
|
|
||||||
ping6_c1t4_head() {
|
ping6_c1t4_head()
|
||||||
atf_set "descr" "-t4 is not interpreted as -t -4 by ping6"
|
{
|
||||||
|
atf_set "descr" "-t4 is not interpreted as -t -4 by ping6"
|
||||||
}
|
}
|
||||||
ping6_c1t4_body() {
|
ping6_c1t4_body()
|
||||||
require_ipv6
|
{
|
||||||
atf_check -s exit:0 -o ignore -e empty ping6 -c1 -t4 ::1
|
require_ipv6
|
||||||
|
atf_check -s exit:0 -o ignore -e empty ping6 -c1 -t4 ::1
|
||||||
}
|
}
|
||||||
|
|
||||||
ping_46_head() {
|
ping_46_head()
|
||||||
atf_set "descr" "-4 and -6 may not be used together"
|
{
|
||||||
|
atf_set "descr" "-4 and -6 may not be used together"
|
||||||
}
|
}
|
||||||
ping_46_body() {
|
ping_46_body()
|
||||||
atf_check -s exit:1 -e ignore ping -4 -6
|
{
|
||||||
|
atf_check -s exit:1 -e ignore ping -4 -6
|
||||||
}
|
}
|
||||||
|
|
||||||
ping6_46_head() {
|
ping6_46_head()
|
||||||
atf_set "descr" "-4 and -6 may not be used together"
|
{
|
||||||
|
atf_set "descr" "-4 and -6 may not be used together"
|
||||||
}
|
}
|
||||||
ping6_46_body() {
|
ping6_46_body()
|
||||||
atf_check -s exit:1 -e ignore ping6 -4 -6
|
{
|
||||||
|
atf_check -s exit:1 -e ignore ping6 -4 -6
|
||||||
}
|
}
|
||||||
|
|
||||||
|
atf_init_test_cases()
|
||||||
atf_init_test_cases() {
|
{
|
||||||
atf_add_test_case ping_c1_s56_t1
|
atf_add_test_case ping_c1_s56_t1
|
||||||
atf_add_test_case ping_c1_s56_t1_S127
|
atf_add_test_case ping_c1_s56_t1_S127
|
||||||
atf_add_test_case ping_6_c1_s8_t1
|
atf_add_test_case ping_6_c1_s8_t1
|
||||||
atf_add_test_case ping_c1_s8_t1_S1
|
atf_add_test_case ping_c1_s8_t1_S1
|
||||||
atf_add_test_case ping6_c1_s8_t1
|
atf_add_test_case ping6_c1_s8_t1
|
||||||
atf_add_test_case ping_c1t6
|
atf_add_test_case ping_c1t6
|
||||||
atf_add_test_case ping6_c1t4
|
atf_add_test_case ping6_c1t4
|
||||||
atf_add_test_case ping_46
|
atf_add_test_case ping_46
|
||||||
atf_add_test_case ping6_46
|
atf_add_test_case ping6_46
|
||||||
}
|
}
|
||||||
|
|
||||||
check_ping_statistics() {
|
check_ping_statistics()
|
||||||
sed -e 's/0.[0-9]\{3\}//g' \
|
{
|
||||||
-e 's/[1-9][0-9]*.[0-9]\{3\}//g' \
|
sed -e 's/0.[0-9]\{3\}//g' \
|
||||||
-e 's/localhost ([0-9]\{1,3\}\(\.[0-9]\{1,3\}\)\{1,3\})/localhost/' \
|
-e 's/[1-9][0-9]*.[0-9]\{3\}//g' \
|
||||||
-e 's/from [0-9]\{1,3\}\(\.[0-9]\{1,3\}\)\{1,3\}/from/' \
|
-e 's/localhost ([0-9]\{1,3\}\(\.[0-9]\{1,3\}\)\{1,3\})/localhost/' \
|
||||||
-e 's/ttl=[0-9][0-9]*/ttl=/' \
|
-e 's/from [0-9]\{1,3\}\(\.[0-9]\{1,3\}\)\{1,3\}/from/' \
|
||||||
-e 's/hlim=[0-9][0-9]*/hlim=/' \
|
-e 's/ttl=[0-9][0-9]*/ttl=/' \
|
||||||
"$1" >"$1".filtered
|
-e 's/hlim=[0-9][0-9]*/hlim=/' \
|
||||||
atf_check -s exit:0 diff -u "$1".filtered "$2"
|
"$1" >"$1".filtered
|
||||||
|
atf_check -s exit:0 diff -u "$1".filtered "$2"
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user