From owner-dev-commits-src-main@freebsd.org Tue Sep 28 18:38:42 2021 Return-Path: Delivered-To: dev-commits-src-main@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 EC4756AA2E1; Tue, 28 Sep 2021 18:38:42 +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 4HJpDf6PNwz4fHR; Tue, 28 Sep 2021 18:38:42 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 BB8F3163E; Tue, 28 Sep 2021 18:38:42 +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 18SIcgEv070316; Tue, 28 Sep 2021 18:38:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18SIcgnf070315; Tue, 28 Sep 2021 18:38:42 GMT (envelope-from git) Date: Tue, 28 Sep 2021 18:38:42 GMT Message-Id: <202109281838.18SIcgnf070315@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: b9b5a4dd590e - main - gmultipath failloop test: Put the dtrace sanity checker in right place MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9b5a4dd590e1b30d92dc73b3d1f22d3303e7e41 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Sep 2021 18:38:43 -0000 The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=b9b5a4dd590e1b30d92dc73b3d1f22d3303e7e41 commit b9b5a4dd590e1b30d92dc73b3d1f22d3303e7e41 Author: Li-Wen Hsu AuthorDate: 2021-09-28 18:38:34 +0000 Commit: Li-Wen Hsu CommitDate: 2021-09-28 18:38:34 +0000 gmultipath failloop test: Put the dtrace sanity checker in right place Check if dtrace excution is successful or not right after execution. Sponsored by: The FreeBSD Foundation --- tests/sys/geom/class/multipath/failloop.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/sys/geom/class/multipath/failloop.sh b/tests/sys/geom/class/multipath/failloop.sh index 632458e1f0b1..48006d6b10da 100755 --- a/tests/sys/geom/class/multipath/failloop.sh +++ b/tests/sys/geom/class/multipath/failloop.sh @@ -60,12 +60,12 @@ failloop_body() -i 'geom:multipath:config:restore {@restore = count()}' \ -c "dd if=/dev/zero of=/dev/multipath/"$name" bs=4096 count=1" \ 2>&1 | awk '/exited with status/ {print $NF}'` - # The dd command should've failed ... - atf_check_equal 1 $dd_status - # and triggered 1 or 2 path restores if [ ! -f restore_count ]; then atf_fail "dtrace didn't execute successfully" fi + # The dd command should've failed ... + atf_check_equal 1 $dd_status + # and triggered 1 or 2 path restores if [ `cat restore_count` -gt 2 ]; then atf_fail "gmultipath restored paths too many times" fi