From nobody Tue Oct 15 13:36:08 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 4XSZqr3Y7gz5YxdF; Tue, 15 Oct 2024 13:36:08 +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 4XSZqr2lSvz4rqw; Tue, 15 Oct 2024 13:36:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728999368; 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=WPWqDX9JFSgyWHklxwki6UgKK41wJ4yAU2BbNXVyOY8=; b=AEDOFbyduEupHGXou1XMdCg5LN1ZopBovpf2rn2jo/TB0TxKY+OAojHDsXy76yrZEEVlJ0 gcJYTp+MVB3XQLpqWlQbjh+Ils71zwNCv+KCN2w7n3raAPmQIrdp27Afnikx+pq/lqoyJn OIrlopx8JfIgLmoimGLwndA3GQ4AhJ0mPclY4QfeNO4UycUfbqWCzKyeTr9AjKVKM9Jxj6 SKiYnm9dgsuzl9yQRolC2IwwvucstQxc23wZvyLAlLhUJcsQMbVF0u0gh281Yur7GpGQ8c zpdkXgFMAAaOWYFZBRkgJB2ttn/ByRY4z8bOJRBHLu7hs3zpHM2Y0DHwp+fx4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728999368; 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=WPWqDX9JFSgyWHklxwki6UgKK41wJ4yAU2BbNXVyOY8=; b=nzJSGsnRfQGVsQG7qsh2h+7LESWjp2fJa0XNXnesLAo3R0x2FGR/z+5TGJPqk6lArO1NTy +dxWvX0EyIlvSvlLrjZoY2aPdqfs7bfGh0onICMkjHvpDUQ5f/1H+KtyJMv0IKrn4zWciy weav8aRYqbO9BTIhbuiqk3iG/ioI+TGvnA+Rs/xAbJyfozoRgFJopd4LAlenOkfQ772LpQ 4EkYkWcCbDQj9Gw+A3Bf3ko1sKy18dYfFdDjLSLFQRwn+2cVJGUpKEpKZhhAvPEF6GzgSk 3LbekpnQuxnMVZ+3iChr6l7Ht8/lpYzpQVl59NH2KuY6Sv6lxGAPEt///hr8SA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728999368; a=rsa-sha256; cv=none; b=ogmQ2pTT1+tyTaEEps8IHt18/tpAk9vVIlSX4IiJ6ZKUxDBY5qXSRJfVHGWGvmZFqPltxl jMgBn4FCBIwEH1q53Luj6g2T1g9H2HzQdnUsaUi8lL7FHrNY4YkOacDzq2iY848dKv3GeO D0UAKPnLNrg8CGei790idrVGP+ePvi+XxtrANa5eWZvzAs3VO6gJ3gcjrKQQopSAl8enHZ 411RrLaR9MT4pz51n19lO6a46AC7qmcFisGF1ca46BFvISoU7xgXL/3NljbT96pIQU7C3u ZLZqTVHYPXJ7Aj5NKixJCBcIxy7ngafASSfQ63Lo3tmpwfMkXh1pm1P2LaP+Xw== 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 4XSZqr2N9ZzPC1; Tue, 15 Oct 2024 13:36:08 +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 49FDa8IJ035265; Tue, 15 Oct 2024 13:36:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49FDa8ZI035262; Tue, 15 Oct 2024 13:36:08 GMT (envelope-from git) Date: Tue, 15 Oct 2024 13:36:08 GMT Message-Id: <202410151336.49FDa8ZI035262@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: 81da8e39f789 - stable/14 - geli tests: Work around a missing MFC 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: 81da8e39f78956441a27eb6bb55ac16170a21a14 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=81da8e39f78956441a27eb6bb55ac16170a21a14 commit 81da8e39f78956441a27eb6bb55ac16170a21a14 Author: Mark Johnston AuthorDate: 2024-10-15 13:35:03 +0000 Commit: Mark Johnston CommitDate: 2024-10-15 13:35:59 +0000 geli tests: Work around a missing MFC The test assumes commit 96950419f15510287080c557174e0d8409f06956, but that was never MFCed to stable branches, resulting in a broken test. This is a direct commit to stable/14. --- tests/sys/geom/class/eli/attach_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/geom/class/eli/attach_test.sh b/tests/sys/geom/class/eli/attach_test.sh index 8803fa9f1a40..e4aa3a6cd618 100644 --- a/tests/sys/geom/class/eli/attach_test.sh +++ b/tests/sys/geom/class/eli/attach_test.sh @@ -50,7 +50,7 @@ attach_multiple_fails_body() geli_test_setup sectors=1000 - attach_md md -t malloc -s `expr $sectors + 1` + md=$(attach_md -t malloc -s `expr $sectors + 1`) atf_check dd if=/dev/random of=keyfile bs=512 count=16 status=none atf_check geli init -B none -P -K keyfile ${md}