From owner-svn-src-head@freebsd.org Thu Aug 22 15:08:06 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 12355CB005; Thu, 22 Aug 2019 15:08:06 +0000 (UTC) (envelope-from asomers@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46Dnw56lscz4YDx; Thu, 22 Aug 2019 15:08:05 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C9AED5EE5; Thu, 22 Aug 2019 15:08:05 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7MF85cQ003713; Thu, 22 Aug 2019 15:08:05 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7MF84bg003709; Thu, 22 Aug 2019 15:08:04 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201908221508.x7MF84bg003709@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Thu, 22 Aug 2019 15:08:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r351394 - in head: etc/mtree sbin/ping6 sbin/ping6/tests X-SVN-Group: head X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in head: etc/mtree sbin/ping6 sbin/ping6/tests X-SVN-Commit-Revision: 351394 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Aug 2019 15:08:06 -0000 Author: asomers Date: Thu Aug 22 15:08:04 2019 New Revision: 351394 URL: https://svnweb.freebsd.org/changeset/base/351394 Log: ping6: add a basic functional test Submitted by: Ján Sučan MFC after: 2 weeks Sponsored by: Google, inc. (Google Summer of Code 2019) Differential Revision: https://reviews.freebsd.org/D21292 Added: head/sbin/ping6/tests/ head/sbin/ping6/tests/Makefile (contents, props changed) head/sbin/ping6/tests/ping6_c1_s8_X1.out (contents, props changed) head/sbin/ping6/tests/ping6_test.sh (contents, props changed) Modified: head/etc/mtree/BSD.tests.dist head/sbin/ping6/Makefile Modified: head/etc/mtree/BSD.tests.dist ============================================================================== --- head/etc/mtree/BSD.tests.dist Thu Aug 22 15:00:36 2019 (r351393) +++ head/etc/mtree/BSD.tests.dist Thu Aug 22 15:08:04 2019 (r351394) @@ -442,6 +442,8 @@ .. ping .. + ping6 + .. .. secure lib Modified: head/sbin/ping6/Makefile ============================================================================== --- head/sbin/ping6/Makefile Thu Aug 22 15:00:36 2019 (r351393) +++ head/sbin/ping6/Makefile Thu Aug 22 15:08:04 2019 (r351394) @@ -21,4 +21,7 @@ LIBADD+= cap_dns CFLAGS+=-DWITH_CASPER .endif +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include Added: head/sbin/ping6/tests/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sbin/ping6/tests/Makefile Thu Aug 22 15:08:04 2019 (r351394) @@ -0,0 +1,8 @@ +# $FreeBSD$ + +PACKAGE= tests + +ATF_TESTS_SH+= ping6_test +${PACKAGE}FILES+= ping6_c1_s8_X1.out + +.include Added: head/sbin/ping6/tests/ping6_c1_s8_X1.out ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sbin/ping6/tests/ping6_c1_s8_X1.out Thu Aug 22 15:08:04 2019 (r351394) @@ -0,0 +1,6 @@ +PING6(56=40+8+8 bytes) ::1 --> ::1 +16 bytes from ::1, icmp_seq=0 hlim= time= ms + +--- localhost ping6 statistics --- +1 packets transmitted, 1 packets received, 0.0% packet loss +round-trip min/avg/max/std-dev = /// ms Added: head/sbin/ping6/tests/ping6_test.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sbin/ping6/tests/ping6_test.sh Thu Aug 22 15:08:04 2019 (r351394) @@ -0,0 +1,53 @@ +# +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright (C) 2019 Jan Sucan +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# $FreeBSD$ + +atf_test_case ping6_c1_s8_X1 +ping6_c1_s8_X1_head() { + atf_set "descr" "Stop after receiving 1 ECHO_RESPONSE packet" +} +ping6_c1_s8_X1_body() { + if ! getaddrinfo -f inet6 localhost 1>/dev/null 2>&1; then + atf_skip "IPv6 is not configured" + fi + atf_check -s exit:0 -o save:std.out -e empty \ + ping6 -c 1 -s 8 -X 1 localhost + check_ping_statistics std.out $(atf_get_srcdir)/ping6_c1_s8_X1.out +} + +atf_init_test_cases() { + atf_add_test_case ping6_c1_s8_X1 +} + +check_ping_statistics() { + sed -e 's/0.[0-9]\{3\}//g' \ + -e 's/[1-9][0-9]*.[0-9]\{3\}//g' \ + -e 's/hlim=[0-9][0-9]*/hlim=/' \ + "$1" >"$1".filtered + atf_check -s exit:0 diff -u "$1".filtered "$2" +}