Skip to contentSkip to conversation

btrfs-progs: mkfs-tests: Set $csum so mkfs.btrfs does not fail

PATCH In review Marcos Paulo de Souza 2 participants 4 messages Dec 5, 2019 – Dec 10, 2019 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 btrfs-progs: mkfs-tests: Set $csum so mkfs.btrfs does not fail

From: Marcos Paulo de Souza <[email protected]>

---
 tests/mkfs-tests/020-basic-checksums-mount/test.sh | 1 +
 1 file changed, 1 insertion(+)
tests/mkfs-tests/020-basic-checksums-mount/test.sh +1 -0
index 41ef5417..b7252786 100755
@@ -12,6 +12,7 @@ prepare_test_dev
 
 test_mkfs_mount_checksum()
 {
+	csum=$1
 	run_check_stdout $SUDO_HELPER "$TOP/mkfs.btrfs" -f --csum "$csum" "$TEST_DEV" | grep -q "Checksum:.*$csum"
 	run_check $SUDO_HELPER "$TOP/btrfs" inspect-internal dump-super "$TEST_DEV"
 	run_check $SUDO_HELPER "$TOP/btrfs" check "$TEST_DEV"
Signature · 1 line
2.23.0
#1 lore raw

PATCH 2/2 btrfs-progs: mkfs-tests: Change $dev1 to TEST_DEV

From: Marcos Paulo de Souza <[email protected]>

It seems to be a typo, since $dev1 was not set, and we are dealing with TEST_DEV and not with loop devices.

---
 tests/mkfs-tests/020-basic-checksums-mount/test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/mkfs-tests/020-basic-checksums-mount/test.sh +1 -1
index b7252786..42bf5fab 100755
@@ -17,7 +17,7 @@ test_mkfs_mount_checksum()
 	run_check $SUDO_HELPER "$TOP/btrfs" inspect-internal dump-super "$TEST_DEV"
 	run_check $SUDO_HELPER "$TOP/btrfs" check "$TEST_DEV"
 
-	run_check $SUDO_HELPER mount "$dev1" "$TEST_MNT"
+	run_check $SUDO_HELPER mount "$TEST_DEV" "$TEST_MNT"
 	run_check "$TOP/btrfs" filesystem df "$TEST_MNT"
 	run_check $SUDO_HELPER "$TOP/btrfs" filesystem usage "$TEST_MNT"
 	run_check $SUDO_HELPER "$TOP/btrfs" device usage "$TEST_MNT"
Signature · 1 line
2.23.0
Reviewed-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] btrfs-progs: mkfs-tests: Change $dev1 to TEST_DEV

Quoted 6 lines · Marcos Paulo de Souza

From: Marcos Paulo de Souza <[email protected]>

It seems to be a typo, since $dev1 was not set, and we are dealing with TEST_DEV and not with loop devices.

Quoted 18 lines
---
 tests/mkfs-tests/020-basic-checksums-mount/test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/mkfs-tests/020-basic-checksums-mount/test.sh +1 -1
index b7252786..42bf5fab 100755
@@ -17,7 +17,7 @@ test_mkfs_mount_checksum()
 	run_check $SUDO_HELPER "$TOP/btrfs" inspect-internal dump-super "$TEST_DEV"
 	run_check $SUDO_HELPER "$TOP/btrfs" check "$TEST_DEV"
 
-	run_check $SUDO_HELPER mount "$dev1" "$TEST_MNT"
+	run_check $SUDO_HELPER mount "$TEST_DEV" "$TEST_MNT"
 	run_check "$TOP/btrfs" filesystem df "$TEST_MNT"
 	run_check $SUDO_HELPER "$TOP/btrfs" filesystem usage "$TEST_MNT"
 	run_check $SUDO_HELPER "$TOP/btrfs" device usage "$TEST_MNT"
Reviewed-by on v1 1/2
#3 lore raw
In reply to Marcos Paulo de Souza
Quoted 3 lines · Marcos Paulo de Souza

From: Marcos Paulo de Souza <[email protected]>

Quoted 17 lines
---
 tests/mkfs-tests/020-basic-checksums-mount/test.sh | 1 +
 1 file changed, 1 insertion(+)
tests/mkfs-tests/020-basic-checksums-mount/test.sh +1 -0
index 41ef5417..b7252786 100755
@@ -12,6 +12,7 @@ prepare_test_dev
 
 test_mkfs_mount_checksum()
 {
+	csum=$1
 	run_check_stdout $SUDO_HELPER "$TOP/mkfs.btrfs" -f --csum "$csum" "$TEST_DEV" | grep -q "Checksum:.*$csum"
 	run_check $SUDO_HELPER "$TOP/btrfs" inspect-internal dump-super "$TEST_DEV"
 	run_check $SUDO_HELPER "$TOP/btrfs" check "$TEST_DEV"