Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 15 Oct 2024 13:36:08 GMT
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 81da8e39f789 - stable/14 - geli tests: Work around a missing MFC
Message-ID:  <202410151336.49FDa8ZI035262@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=81da8e39f78956441a27eb6bb55ac16170a21a14

commit 81da8e39f78956441a27eb6bb55ac16170a21a14
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-10-15 13:35:03 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
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}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202410151336.49FDa8ZI035262>