From nobody Sat Nov 09 20:04:53 2024 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 4Xm6Gt0HMxz5cbr6; Sat, 09 Nov 2024 20:04:54 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xm6Gs6d5gz4cL7; Sat, 9 Nov 2024 20:04:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731182693; 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=rVTiPJBlVWQQ7zicuqGWpwFooixYdGmT//sopLPuV4Q=; b=QBnK/5dNWj8MN4KcCNjaiBZTX8bT6+paoHkzrQ1Cgc51D5M60EP8tBIV75qqUjnwxVKfqU Kbr6TqapUl5TEH/TAn8zSUxICXBBMiQpMdTC8I1XJ2w1vdJXMCQrTxdI4kug2GfSbBrWoK oXwrZKmq8l9z5SPLkZfC+Ur7bRc0rV3BoBwQt5Y8cc5iHjWGinokJIym/AomM7kbYVAlEs O8XgfkOa6w0crsUF5z5jZwFkdZRpQ2uQzejCYsd2XRUPB4iDw9edhX25YBjsu1YKoEHBFL zFTQQTz7/LyYzhIiu/D3Z5naY7iWh9+fMzL9NtyHApohwBa7b3Od5isM9aBKRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731182693; 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=rVTiPJBlVWQQ7zicuqGWpwFooixYdGmT//sopLPuV4Q=; b=Wpj2ud0yldeXrCsyD/dpmKTfiQlYqLMK1x25FkKp4LOXJvj0iN05ZLjeP1evIgjr/DW4yx X24wCDCEt6jOAIjQQ7kfCOexajOadkO8tb2jtOzCmFWnY3pylaZleSAe4/TRoPPlwOD++x infXFGqL0jIuyw8gb26gWVqip6koQgG2M4U7yqBRs1Gg6spAllcG85CQqz2bar8FykjljO b3hGQGF/ULipaaujlBIl6b/PxeNk+HTK9N06h90saNC381+WM6VLZV97wI9txX7co3MStK QbbTnJLvzF0EyiD6rTBDecI3WOqGmNyahx2wUJ3q/TIgJJxT9MGzvh7/J2FTXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731182693; a=rsa-sha256; cv=none; b=AL0ouUBJhrHw2R/FxgKCj9Ug8EGtco931jkci3lS8ImRfijpQ3NgF/jyTbMsAwktETBhfP KtcAuTbSAGnh2cZBNhaIhV9tVM8GwHwcfpmuEnO16/xBTKxweqfp5LVIZA6HuFfXEYOTNe tV9qDpU/jV14EpD1nnpZOYfujJiVYp7uixD+9D1AUwaJLYmdC15+vugzYNGInk3BDcXNSv S/K9WXlOUp74CdPNjQapoaDiERQjxMqoPj/sntmweUtz5ZZTlOWyhEYnOAFvHvWsZ22Jin sh1DmPxEe2Lfmq1nC06MOdtdhNCbVapIiJNUSiNIo9qCmLf/qCHE0MDy12M0Ww== 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 4Xm6Gs61PKz1R9f; Sat, 9 Nov 2024 20:04:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A9K4rYl013313; Sat, 9 Nov 2024 20:04:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A9K4rvW013310; Sat, 9 Nov 2024 20:04:53 GMT (envelope-from git) Date: Sat, 9 Nov 2024 20:04:53 GMT Message-Id: <202411092004.4A9K4rvW013310@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: f7c45c012201 - main - nvmecontrol tests: Fix nvmecontrol usage in a couple of tests 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: f7c45c012201aff52a83c45c1ba516a855b11ed9 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f7c45c012201aff52a83c45c1ba516a855b11ed9 commit f7c45c012201aff52a83c45c1ba516a855b11ed9 Author: Mark Johnston AuthorDate: 2024-11-09 19:59:46 +0000 Commit: Mark Johnston CommitDate: 2024-11-09 20:04:04 +0000 nvmecontrol tests: Fix nvmecontrol usage in a couple of tests nvmecontrol {admin,io}-passthru's -r option doesn't take an argument, so the tests which added one failed because they tried to open /dev/0. MFC after: 1 week --- sbin/nvmecontrol/tests/basic.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sbin/nvmecontrol/tests/basic.sh b/sbin/nvmecontrol/tests/basic.sh index f4a6b9504a3e..83b74721c66b 100755 --- a/sbin/nvmecontrol/tests/basic.sh +++ b/sbin/nvmecontrol/tests/basic.sh @@ -94,11 +94,11 @@ admin_passthru_head() admin_passthru_body() { if [ -c "${TEST_DEV_PATH}" ] ; then - atf_check -o not-empty -e empty nvmecontrol admin-passthru --opcode=06 --data-len=4096 --cdw10=1 -r 0 ${TEST_DEV} + atf_check -o not-empty -e empty nvmecontrol admin-passthru --opcode=06 --data-len=4096 --cdw10=1 -r ${TEST_DEV} else - atf_check -s not-exit:0 -o empty -e not-empty nvmecontrol admin-passthru --opcode=06 --data-len=4096 --cdw10=1 -r 0 ${TEST_DEV} + atf_check -s not-exit:0 -o empty -e not-empty nvmecontrol admin-passthru --opcode=06 --data-len=4096 --cdw10=1 -r ${TEST_DEV} fi - atf_check -s not-exit:0 -o ignore -e match:"${INV_OPT_MSG}" nvmecontrol admin-passthru ${INV_OPT} --opcode=06 --data-len=4096 --cdw10=1 -r 0 ${TEST_DEV} + atf_check -s not-exit:0 -o ignore -e match:"${INV_OPT_MSG}" nvmecontrol admin-passthru ${INV_OPT} --opcode=06 --data-len=4096 --cdw10=1 -r ${TEST_DEV} } atf_test_case devlist @@ -142,11 +142,11 @@ io_passthru_head() io_passthru_body() { if [ -c "${TEST_DEV_PATH}" ] ; then - atf_check -o not-empty -e empty nvmecontrol io-passthru --opcode=02 --data-len=4096 --cdw10=0 --cdw11=0 --cdw12=0x70000 -r 0 nvme0 ${TEST_DEV} + atf_check -o not-empty -e empty nvmecontrol io-passthru --opcode=02 --data-len=4096 --cdw10=0 --cdw11=0 --cdw12=0x70000 -r nvme0 ${TEST_DEV} else - atf_check -s not-exit:0 -o empty -e not-empty nvmecontrol io-passthru --opcode=02 --data-len=4096 --cdw10=0 --cdw11=0 --cdw12=0x70000 -r 0 nvme0 ${TEST_DEV} + atf_check -s not-exit:0 -o empty -e not-empty nvmecontrol io-passthru --opcode=02 --data-len=4096 --cdw10=0 --cdw11=0 --cdw12=0x70000 -r nvme0 ${TEST_DEV} fi - atf_check -s not-exit:0 -o ignore -e match:"${INV_OPT_MSG}" nvmecontrol io-passthru ${INV_OPT} --opcode=02 --data-len=4096 --cdw10=0 --cdw11=0 --cdw12=0x70000 -r 0 nvme0 ${TEST_DEV} + atf_check -s not-exit:0 -o ignore -e match:"${INV_OPT_MSG}" nvmecontrol io-passthru ${INV_OPT} --opcode=02 --data-len=4096 --cdw10=0 --cdw11=0 --cdw12=0x70000 -r nvme0 ${TEST_DEV} } atf_test_case logpage