From nobody Tue Nov 19 14:31:17 2024 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 4Xt6PL1Qx3z5f4qv; Tue, 19 Nov 2024 14:31:18 +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 4Xt6PL0wz9z42q7; Tue, 19 Nov 2024 14:31:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732026678; 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=h1+nTSoie1B3Py63PCV7vE3Aog/w6QLl0lbtD57w52c=; b=j4k1a2vnm+fhhcL+8FQGqwHVmFEMMfbt7FsvzcnFzrd/hew/jZI79jKm85UtUuElG7ORmQ NwZdcCN4QcKAD/QhdC5Pct45VfzaTf1MN5wYScij3QQ1byZGCwYzBKfcR7Or+rTK7mFWqH suoRZZ/FX2cE4IKnVy54vJPFhIDDwS+MHIbjK2je7R6P4TJO53BGmed0kjbWyuC2MIsTKW iAnztbJRkB04RqCe3gwwQ7lgseUgpBgO4EWzNdSfujODrAx99+EcBVWUFPAHauvyk8Hkii 5y95/EPyglavNqtq+izCAyePZy1IpsgwCBvkK1NnRuStEt53LghJm9Xf5pWAhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732026678; 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=h1+nTSoie1B3Py63PCV7vE3Aog/w6QLl0lbtD57w52c=; b=cjywaKPIPBFEr//g/s9gjoMOxAqojpjRoIhGmtWyjUoPR5KlO/qcl71Ov7lYlzN4yEe+tC 9ExLS19GeineoTkVHQeXRekka/ibv6CAEuIjzCJ2TnRO+tOB0NWpp5NzeTFRfkndDv6gKY o/g59ge7Ac2exgb0+a13NFAtsS+K8LSJblro/fYjr+UhvOGwcqPkBoxoMvAlvFryaSNQ+9 r3O9HSoU3qbnEwFTrcdX9S+/4iJAKPS0L/Sx+mcp7bAveTd9OC51kDsE+qwvGlMESBUoPV q3GYeyR37Naysz5eipwgyCzDH9s5hHl/h7aUDAME6HE6I3yuErjgm+fbEqvhHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732026678; a=rsa-sha256; cv=none; b=TQMa53sMsqT7Gs8BbN1JH1fyuY9n7Zf1Lahp7LgE0GeUA6zPEhjOHOp9o0/M9fcpWWrHed /RZphuSAFP5NU02/488Xcnvn23cMwt2VGNC6p2jEd0YpTB5ezM1SDLjxhluSF9omFGwMs9 lSAbOqISqK+9j+aylMTIaGtvydmaHLEi8tDujIE1QYEOTTgH/gjr3sSnbvKzV7V8VfV2/D H6TSFq+drsel69EgtiOLgpEObCLzbZBOLSaNfwy97RDCFmcO+wVXpPjopoZtumkULBuxIm PhFxiwRKayPYdy4ZDaRVPtxTZu7D3kBbfgWMA8NQQ92nhroSIcv5W4UI/NfGrw== 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 4Xt6PL0D0Cz1Rd1; Tue, 19 Nov 2024 14:31:18 +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 4AJEVHVB040782; Tue, 19 Nov 2024 14:31:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AJEVHGC040779; Tue, 19 Nov 2024 14:31:17 GMT (envelope-from git) Date: Tue, 19 Nov 2024 14:31:17 GMT Message-Id: <202411191431.4AJEVHGC040779@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: 1fce096e2a0d - stable/14 - nvmecontrol tests: Fix nvmecontrol usage in a couple of tests 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 1fce096e2a0d27d53962938c4cc09448d681c079 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1fce096e2a0d27d53962938c4cc09448d681c079 commit 1fce096e2a0d27d53962938c4cc09448d681c079 Author: Mark Johnston AuthorDate: 2024-11-09 19:59:46 +0000 Commit: Mark Johnston CommitDate: 2024-11-19 14:15:06 +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 (cherry picked from commit f7c45c012201aff52a83c45c1ba516a855b11ed9) --- 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