From nobody Mon Jan 20 16:24:07 2025 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 4YcFyv6f3lz5kKgp; Mon, 20 Jan 2025 16:24:07 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YcFyv5rPxz3S82; Mon, 20 Jan 2025 16:24:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737390247; 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=1NqUjmH0fZ9RkN+R7jmcAYegzES9vbVRy7I5a775C3U=; b=lCWHk7eRBHcF1Kb4bCh8ZRaONf2HjnZCXPHdz55CNJoNwmqHWSyQx6eFBCF939gA++Rb7D tOQJ10re1Wov8f/vTWJSxsTz+S3HkyQKJ6wRScsR5lVZdla/HW9e1sOQO9S/RG/j8r9kWz xRk5REMVFpflsiH4BT5vttidE9bqqKf5DBsXvD/6EVwRmykZ1xDeVEJtnXlGsMT0VTNp6a ZJO3kmpyqDi3bAym3Mg0VHrdrNUrx1mCxTqbPMb3IslzViwQCZFpQps30d+cQQzQdd6DBc Ncpz6LqcwjraXp0EASp2uTeNE61zAzlV0R2U8Rq5AaXOKhnlDb0C7Z74dnBNFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737390247; 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=1NqUjmH0fZ9RkN+R7jmcAYegzES9vbVRy7I5a775C3U=; b=JyIO4OULJAp+bNwCL+zFySwoZT3rF3TUSou8Z3YBHdJmtiCyzlqj0I3h03yInmUbmbjSFM kxcAsG0Ry90HuqOGdRdbLGpP7E80GNO32EFHFNH2idE6VT5yws58uZQxOHgQGggFKR1dmp VXSKlF6CQFVXTnqiOxQolZc62AfPAF49gyeyxPP/hRD8E7SfuHnlrhFD7tlXJz1305kvwY h4TVNuK0L27q9FnSFwL+tyuc5ORQJEPy+fKRpTFxjYNgluwvhPOBiFX5nw/6fPKf5UV0YY uaPEghxVFRg9V4YSzrgnbS421bHu0zenbh6GGAreI/1l3tP+mAkNOKwZR8z0EA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737390247; a=rsa-sha256; cv=none; b=Ms4tnLffzbXe8e+gKD2zPlLEJx9wCSmdPdMPWRue2txrFu6tIABX+46M1EA8aZHV0KBfgK dRQMeiJHt1A8ToPrlyILAeN9BZFVg7ZERzapBM6XQecqjraf1MNgx18Q9PPMO/i6p8ZVnw 3y3cH4iYp3yVXUkzwUpgUdQlV7Ne58ewfMNhWKxT+cDPjlH8agP+uQH5BW4h4BSmv+LaJW hRuaasc6ieoNSJyWkdh78WIzfQGhJ1148zdZHyXqTpvJW39YgRzzjqyViJYXqyhFYlCY+L KjMzeqd/EePxKlAKXSaiQXQn4z3xEvoFRE8+O/d+NFDEC7EZcfJP1ZA6Zbx1mw== 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 4YcFyv5RXXzCD1; Mon, 20 Jan 2025 16:24:07 +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 50KGO7tn011388; Mon, 20 Jan 2025 16:24:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50KGO7ha011385; Mon, 20 Jan 2025 16:24:07 GMT (envelope-from git) Date: Mon, 20 Jan 2025 16:24:07 GMT Message-Id: <202501201624.50KGO7ha011385@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 23b270405951 - stable/14 - Make the CTL tests more resilient 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 23b2704059512b985bb14b220d92102bc4569b3e Auto-Submitted: auto-generated The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=23b2704059512b985bb14b220d92102bc4569b3e commit 23b2704059512b985bb14b220d92102bc4569b3e Author: Alan Somers AuthorDate: 2024-11-05 00:26:01 +0000 Commit: Alan Somers CommitDate: 2025-01-20 16:23:08 +0000 Make the CTL tests more resilient Fix the find_device function to work regardless of whether "camcontrol devlist" lists the da device first and the pass device second or vice versa. On FreeBSD 14 and 15 it apparently always lists da first. But on 13 it can do it in either order. Sponsored by: ConnectWise Reviewed by: emaste, markj, #cam Differential Revision: https://reviews.freebsd.org/D47446 (cherry picked from commit b032be711c740d2f25b27c92069537edcfac221c) --- tests/sys/cam/ctl/ctl.subr | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/sys/cam/ctl/ctl.subr b/tests/sys/cam/ctl/ctl.subr index 18991e0fa144..868b1c809571 100644 --- a/tests/sys/cam/ctl/ctl.subr +++ b/tests/sys/cam/ctl/ctl.subr @@ -47,7 +47,14 @@ find_device() { ctladm port -o on -p 0 >/dev/null HEXLUN=`printf %x $LUN` while true; do - dev=`camcontrol devlist | awk -v lun=$HEXLUN '/FREEBSD CTL/ && $9==lun {split($10, fields, /[,]/); print fields[1];}' | sed 's:[()]::'` + dev=`camcontrol devlist | awk -v lun=$HEXLUN ' + /FREEBSD CTL.*,pass/ && $9==lun { + split($10, fields, /[,]/); print fields[1]; + } + /FREEBSD CTL.*\(pass/ && $9==lun { + split($10, fields, /[,]/); print fields[2]; + } + ' | sed 's:[()]::'` if [ -z "$dev" -o ! -c /dev/$dev ]; then retries=$(( $retries - 1 )) if [ $retries -eq 0 ]; then