From nobody Tue Oct 01 14:06:26 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 4XJ09H0hDLz5XtXw; Tue, 01 Oct 2024 14:06:27 +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 4XJ09G6yr8z442G; Tue, 1 Oct 2024 14:06:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727791587; 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=NZx/92qJeu8UNQiPu09V0i/tuz53j2wV6EDs8M6ahQY=; b=QjJVIFM/lajPxSGJMS/cOD14qjowFY+v6sDzp0qypdeJx2ygdNVLi9ZyXLIxU/nW+2ITWg p9cLtqS93TW/K+bBRGGo6JFMIarjYTxGCwZXh3nRzs13SX52gMXnJYjEhdnY5CyT8oq073 QzZs9rEns/xuqI3pt6ptmONMnC52iMLqmLHzJDuKLJLLSza3jS9XvTfiz9h1FpvDjudFm8 HCl047C3SixAvwR1rHcBh/XDhmjq/ygt8AltpFh3LvxN8GakvADpNZ0S4532CGoqTD6njn 8g/CaZMu5SnCJOCbskJk3WxG5Ruz68iVvQ0FaNecHxTh3/eLiuOHtj1WlGUVOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727791587; 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=NZx/92qJeu8UNQiPu09V0i/tuz53j2wV6EDs8M6ahQY=; b=m9mibV8VUvjsQg/ksXu1P5mTdKrYl91NiL35MYcWnDDvAR/65/st2wyBOj0heQ0tDNAsll dS+xFxsJzPOCGp4/yZdSMy8iDjYI0me3NaWCUTT0lfKFHQgm9I5EycpgLZ8vpJJFdhqq9c SFg3vjp8ELYLzd7BlmWtvvh5X5Ip9IjFO6fLUB+twIqTQmi6Fo5aEcBQiUUGPHNw08c7Wv 5RxjaWztLut2RiLGtw4sey3LqW6sD/5725DbwaB5Cw0Xrh+N0mX64yn9rjiuBirzogoV4T RWMLK6dFl1IVxUzo/gfMw3e/IYRSM7J6ccPZ3gP+J4BM20xwgQYZZwdIN9p2QQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727791587; a=rsa-sha256; cv=none; b=rwLrWZAgX7G4Eg4qZToGBJOZ8VJpYlWkCBGpJQfcJjm6A4CRvTDnzcnHxYP09DMjHe2CW8 //iA2LO263/vqAqUUUvu16nBVzP80QrNVlS8GkX24GzYt6wNj5TOx8/16sTOp2MuxA8sWe zDKfgObgL8SMOwzA8wlNY+LVLnP/KafpnVj/rYJoFUDEuyJxuv2MHWgrOsTRtJf49uYbUh xJFZPa2fM08uw3c2tflX6dijU7o20kwui0rHDwt5zhjNuqzMjIzqSOh8LG1MEJH/dNRt9O TeZmmKfpJReUrZelaRrfbHT0XPS6jBHEb5d0YjbLPukOkFaPZg0kg5jvbwySIw== 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 4XJ09G6RPNzgby; Tue, 1 Oct 2024 14:06:26 +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 491E6Qej023782; Tue, 1 Oct 2024 14:06:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 491E6Q09023780; Tue, 1 Oct 2024 14:06:26 GMT (envelope-from git) Date: Tue, 1 Oct 2024 14:06:26 GMT Message-Id: <202410011406.491E6Q09023780@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Cochard Subject: git: 215fd38e2915 - main - ctl: skip the test if ctladm is missing (WITHOUT_ISCSI) 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: olivier X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 215fd38e2915d142cb4b0245f137329ef4da5a12 Auto-Submitted: auto-generated The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/src/commit/?id=215fd38e2915d142cb4b0245f137329ef4da5a12 commit 215fd38e2915d142cb4b0245f137329ef4da5a12 Author: Olivier Cochard AuthorDate: 2024-10-01 13:59:47 +0000 Commit: Olivier Cochard CommitDate: 2024-10-01 13:59:47 +0000 ctl: skip the test if ctladm is missing (WITHOUT_ISCSI) Reviewed by: asomers Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D46853 --- tests/sys/cam/ctl/prevent.sh | 10 +++++----- tests/sys/cam/ctl/read_buffer.sh | 10 +++++----- tests/sys/cam/ctl/start_stop_unit.sh | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/sys/cam/ctl/prevent.sh b/tests/sys/cam/ctl/prevent.sh index a5a187dad8ff..315bedc39581 100644 --- a/tests/sys/cam/ctl/prevent.sh +++ b/tests/sys/cam/ctl/prevent.sh @@ -36,7 +36,7 @@ allow_head() { atf_set "descr" "SCSI PREVENT ALLOW MEDIUM REMOVAL will prevent a CD from being ejected" atf_set "require.user" "root" - atf_set "require.progs" sg_prevent sg_start + atf_set "require.progs" "sg_prevent sg_start ctladm" } allow_body() { @@ -63,7 +63,7 @@ allow_idempotent_head() { atf_set "descr" "SCSI PREVENT ALLOW MEDIUM REMOVAL is idempotent when run from the same initiator" atf_set "require.user" "root" - atf_set "require.progs" sg_prevent sg_start + atf_set "require.progs" "sg_prevent sg_start ctladm" } allow_idempotent_body() { @@ -89,7 +89,7 @@ nonremovable_head() { atf_set "descr" "SCSI PREVENT ALLOW MEDIUM REMOVAL may not be used on non-removable media" atf_set "require.user" "root" - atf_set "require.progs" sg_prevent + atf_set "require.progs" "sg_prevent ctladm" } nonremovable_body() { @@ -108,7 +108,7 @@ prevent_head() { atf_set "descr" "SCSI PREVENT ALLOW MEDIUM REMOVAL will prevent a CD from being ejected" atf_set "require.user" "root" - atf_set "require.progs" sg_prevent sg_start + atf_set "require.progs" "sg_prevent sg_start ctladm" } prevent_body() { @@ -130,7 +130,7 @@ prevent_idempotent_head() { atf_set "descr" "SCSI PREVENT ALLOW MEDIUM REMOVAL is idempotent when run from the same initiator" atf_set "require.user" "root" - atf_set "require.progs" sg_prevent sg_start + atf_set "require.progs" "sg_prevent sg_start ctladm" } prevent_idempotent_body() { diff --git a/tests/sys/cam/ctl/read_buffer.sh b/tests/sys/cam/ctl/read_buffer.sh index e54b0dadc134..98515943dd40 100644 --- a/tests/sys/cam/ctl/read_buffer.sh +++ b/tests/sys/cam/ctl/read_buffer.sh @@ -35,7 +35,7 @@ basic_head() { atf_set "descr" "READ BUFFER can retrieve data previously written by WRITE BUFFER" atf_set "require.user" "root" - atf_set "require.progs" sg_read_buffer sg_write_buffer + atf_set "require.progs" "sg_read_buffer sg_write_buffer ctladm" } basic_body() { @@ -66,7 +66,7 @@ desc_head() { atf_set "descr" "READ BUFFER can retrieve the buffer size via the DESCRIPTOR mode" atf_set "require.user" "root" - atf_set "require.progs" sg_read_buffer + atf_set "require.progs" "sg_read_buffer ctladm" } desc_body() { @@ -84,7 +84,7 @@ length_head() { atf_set "descr" "READ BUFFER can limit its length with the LENGTH field" atf_set "require.user" "root" - atf_set "require.progs" sg_read_buffer sg_write_buffer + atf_set "require.progs" "sg_read_buffer sg_write_buffer ctladm" } length_body() { @@ -113,7 +113,7 @@ offset_head() { atf_set "descr" "READ BUFFER accepts the BUFFER OFFSET field" atf_set "require.user" "root" - atf_set "require.progs" sg_read_buffer sg_write_buffer + atf_set "require.progs" "sg_read_buffer sg_write_buffer ctladm" } offset_body() { @@ -142,7 +142,7 @@ uninitialized_head() { atf_set "descr" "READ BUFFER buffers are zero-initialized" atf_set "require.user" "root" - atf_set "require.progs" sg_read_buffer + atf_set "require.progs" "sg_read_buffer ctladm" } uninitialized_body() { diff --git a/tests/sys/cam/ctl/start_stop_unit.sh b/tests/sys/cam/ctl/start_stop_unit.sh index 163011c8f574..a1160b35e4a7 100644 --- a/tests/sys/cam/ctl/start_stop_unit.sh +++ b/tests/sys/cam/ctl/start_stop_unit.sh @@ -40,7 +40,7 @@ eject_head() { atf_set "descr" "START STOP UNIT can eject a CDROM device" atf_set "require.user" "root" - atf_set "require.progs" sg_start sg_readcap + atf_set "require.progs" "sg_start sg_readcap ctladm" } eject_body() { @@ -68,7 +68,7 @@ load_head() { atf_set "descr" "START STOP UNIT can load a CDROM device" atf_set "require.user" "root" - atf_set "require.progs" sg_start sg_readcap + atf_set "require.progs" "sg_start sg_readcap ctladm" } load_body() { @@ -97,7 +97,7 @@ start_head() { atf_set "descr" "START STOP UNIT can start a device" atf_set "require.user" "root" - atf_set "require.progs" sg_start sg_readcap + atf_set "require.progs" "sg_start sg_readcap ctladm" } start_body() { @@ -123,7 +123,7 @@ stop_head() { atf_set "descr" "START STOP UNIT can stop a device" atf_set "require.user" "root" - atf_set "require.progs" sg_start sg_readcap + atf_set "require.progs" "sg_start sg_readcap ctladm" } stop_body() {