From nobody Thu Nov 10 17:02:29 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 4N7SnK5gLmz4dN8q; Thu, 10 Nov 2022 17:02:29 +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 4N7SnK5Dnlz3hh5; Thu, 10 Nov 2022 17:02:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668099749; 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=Evq4RYwGDihBJW9yn+spAmQ9vSIkjf0x19FJAAfciwk=; b=NWEG8hfAdMVJ7PEGPau82GysV4EjC79W6Y5OzpDiocpwBB2V5Nsvv0aQR7AsEAOZEgk+0R lh7flJjwiuQFe91yHDChld+O2nZ13A3esveVOPPc7i82E6UwXizJiGev6xLn4uQDqTb5lR K00URhE1lfD+czA5vwcmZGUHWogxhpiedEl73rLVgbqCDZyFl8UXecM5NjmvOm1roHQ6I6 8gOWHqlteGpukC/fh0CyRQ1fe2HgvNq6kcF5LVq8fyS/jFLgRj26EpGMkZ7iMozT54Zdc4 sYADKGR2xwZ+r5r6hr+6ffmxDJpDloXovsmx+30Pa22+JtZbYimj0w5tgqaZ/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668099749; 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=Evq4RYwGDihBJW9yn+spAmQ9vSIkjf0x19FJAAfciwk=; b=S6IcRL6KhP8mtJlZgDoYi04gIRXXaS6c5fNAt/uzEHKKdD9iBTSDmFyugtNadV+XsPuPTE LVc45ERvZI5BW+Y2+JzpRlXINmkGpIZfJvWtVGnTp8uM6Q7hA3DhPt+9+6NDcd/9rg40sc qJzCr0mHIPCK3x7fSWmh/zcqclV8KYdr6K5lTYf3m+yfFP4BmDrcyQU00QkaVcj+F2k5uu wHXsLEO7c6gVxTfPp8Vr0HsxYAHB1m+mFk1sO2/OJTc5IiL4gXeckTKndfMLWEvjSCJVva aaBHH8f3SXmImFsMvmfzyTc16Wlsa5Dok8AgQHwQIVjfwr+F4QqFgBGW0CqQOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668099749; a=rsa-sha256; cv=none; b=qkZv+LRsCvnlWfanUVuz5IEUqFUpv3rjO3ZAPkjvuwWrE4hoiEUdEFbNCORekuEImvfKsD 4p4BRmYNjt5tP+f2e0YvsDQmKFN0IYtyFs8FRWEHnrYM5YCXKuzeanTXHlW8i3QmWXQ5+P pFoD4SCTMGEqxx4Br2vAXxS/kl4uunhv42jsvD7jpTsjgVUFT/N6tUzVnzGeVCD2l9gOgX FVtBuPCzsEtJue5yXvgfVuM0bMm7L7jaQEe7provGEghPCfmjSsQi6bK9f6cIqZ4M78Eb/ FoAex7sClLgHnaozh87kB92H/Xx+DVd75M3QjfUa8duEyaZzrU2CUHPZDrHYqQ== 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 4N7SnK4Ktqz181W; Thu, 10 Nov 2022 17:02:29 +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 2AAH2T5Z016305; Thu, 10 Nov 2022 17:02:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AAH2T65016304; Thu, 10 Nov 2022 17:02:29 GMT (envelope-from git) Date: Thu, 10 Nov 2022 17:02:29 GMT Message-Id: <202211101702.2AAH2T65016304@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: ff88c47e5382 - stable/13 - ping_test: Fix tests ping_46 and ping6_46 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: ff88c47e53824e70c284d89d9916612accbba075 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ff88c47e53824e70c284d89d9916612accbba075 commit ff88c47e53824e70c284d89d9916612accbba075 Author: Jose Luis Duran AuthorDate: 2022-11-02 11:43:40 +0000 Commit: Mark Johnston CommitDate: 2022-11-10 17:02:01 +0000 ping_test: Fix tests ping_46 and ping6_46 If no IPv4-host, IPv4-mcast-group or IPv6-host is passed, it will display the usage. The tests are passing because they are just checking that the exit code is 1. Fix the tests by checking the appropriate output message. While here, change the description to match the output and add the missing requirements. Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D37250 (cherry picked from commit d481443acb1c77610ac50a226f402e4629a608fb) --- sbin/ping/tests/ping_test.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sbin/ping/tests/ping_test.sh b/sbin/ping/tests/ping_test.sh index 55456a5c86ba..c79a792d0eb0 100644 --- a/sbin/ping/tests/ping_test.sh +++ b/sbin/ping/tests/ping_test.sh @@ -129,20 +129,28 @@ ping6_c1t4_body() ping_46_head() { - atf_set "descr" "-4 and -6 may not be used together" + atf_set "descr" "-4 and -6 cannot be used simultaneously" } ping_46_body() { - atf_check -s exit:1 -e ignore ping -4 -6 + require_ipv4 + require_ipv6 + atf_check -s exit:1 \ + -e match:"-4 and -6 cannot be used simultaneously" \ + ping -4 -6 localhost } ping6_46_head() { - atf_set "descr" "-4 and -6 may not be used together" + atf_set "descr" "-4 and -6 cannot be used simultaneously" } ping6_46_body() { - atf_check -s exit:1 -e ignore ping6 -4 -6 + require_ipv4 + require_ipv6 + atf_check -s exit:1 \ + -e match:"-4 and -6 cannot be used simultaneously" \ + ping6 -4 -6 localhost } atf_init_test_cases()