From 65f1c3f52a1ef6516f2ddb70a8f4bae58c87c3de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BChlbacher?= <tmuehlbacher@posteo.net>
Date: Thu, 27 Jun 2024 16:30:15 +0200
Subject: [PATCH] fixup! test(nix): add basic functionality testing infra
---
checks/default.nix | 1 +
checks/encrypted-multidev.sh | 4 ++--
checks/encrypted-unlock.sh | 12 ++++++------
checks/nested.sh | 2 +-
4 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/checks/default.nix b/checks/default.nix
index b014687b..7f535f80 100644
--- a/checks/default.nix
+++ b/checks/default.nix
@@ -35,6 +35,7 @@ let
];
environment.variables = {
+ BCACHEFS_LOG = "trace";
RUST_BACKTRACE = "full";
};
};
diff --git a/checks/encrypted-multidev.sh b/checks/encrypted-multidev.sh
index c6f4426d..d4e5c9ff 100755
--- a/checks/encrypted-multidev.sh
+++ b/checks/encrypted-multidev.sh
@@ -28,10 +28,10 @@ echo "$pw" | bcachefs format \
udevadm settle
-echo "$pw" | bcachefs mount -v "UUID=$uuid" "$mnt"
+echo "$pw" | bcachefs mount "UUID=$uuid" "$mnt"
keyctl search @u user "bcachefs:$uuid"
umount "$mnt"
-bcachefs mount -v "${blkdev}1" "$mnt"
+bcachefs mount "${blkdev}1" "$mnt"
diff --git a/checks/encrypted-unlock.sh b/checks/encrypted-unlock.sh
index 9a85e2e8..23a345bb 100755
--- a/checks/encrypted-unlock.sh
+++ b/checks/encrypted-unlock.sh
@@ -23,7 +23,7 @@ bcachefs unlock -c "$blkdev"
echo "$pw" | bcachefs unlock "$blkdev"
key_id=$(keyctl search @u user "bcachefs:$uuid")
-bcachefs mount -v "$blkdev" "$mnt"
+bcachefs mount "$blkdev" "$mnt"
umount "$mnt"
keyctl unlink "$key_id"
@@ -36,20 +36,20 @@ umount "$mnt"
keyctl unlink "$key_id"
-bcachefs mount -v -f <(echo "$pw") "$blkdev" "$mnt"
+bcachefs mount -f <(echo "$pw") "$blkdev" "$mnt"
key_id=$(keyctl search @u user "bcachefs:$uuid")
umount "$mnt"
keyctl unlink "$key_id"
-echo "$pw" | bcachefs mount -v -k stdin "$blkdev" "$mnt"
+echo "$pw" | bcachefs mount -k stdin "$blkdev" "$mnt"
key_id=$(keyctl search @u user "bcachefs:$uuid")
umount "$mnt"
keyctl unlink "$key_id"
-echo "$pw" | bcachefs mount -v "$blkdev" "$mnt"
+echo "$pw" | bcachefs mount "$blkdev" "$mnt"
key_id=$(keyctl search @u user "bcachefs:$uuid")
umount "$mnt"
-bcachefs mount -v -k fail "$blkdev"
-bcachefs mount -v -k wait "$blkdev" "$mnt"
+bcachefs mount -k fail "$blkdev"
+bcachefs mount -k wait "$blkdev" "$mnt"
umount "$mnt"
keyctl unlink "$key_id"
diff --git a/checks/nested.sh b/checks/nested.sh
index 20cb58a3..edb955c1 100755
--- a/checks/nested.sh
+++ b/checks/nested.sh
@@ -19,7 +19,7 @@ echo "$pw" | bcachefs format \
udevadm settle
-echo "$pw" | bcachefs mount -v "UUID=$uuid" "$mnt1"
+echo "$pw" | bcachefs mount "UUID=$uuid" "$mnt1"
fallocate --length 2G "$mnt1/fs.img"