From 30fde12728bf1cdc2834c6eebe24ec7550b9a9fe Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Mon, 10 Apr 2023 14:11:31 -0400 Subject: [PATCH] btrfs-progs: tests: fix fsck-tests/056 to run without root We need to make sure the root helper is setup before calling the loop helpers, and additionally we need to use $SUDO_HELPER when we run the final btrfs check. With this patch we can now run this test as a normal user. Reviewed-by: Neal Gompa Signed-off-by: Josef Bacik Signed-off-by: David Sterba --- tests/fsck-tests/056-raid56-false-alerts/test.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/fsck-tests/056-raid56-false-alerts/test.sh b/tests/fsck-tests/056-raid56-false-alerts/test.sh index 6efb5c00..fcd37971 100755 --- a/tests/fsck-tests/056-raid56-false-alerts/test.sh +++ b/tests/fsck-tests/056-raid56-false-alerts/test.sh @@ -10,13 +10,13 @@ check_prereq btrfs check_prereq mkfs.btrfs check_global_prereq losetup +setup_root_helper + setup_loopdevs 3 prepare_loopdevs dev1=${loopdevs[1]} TEST_DEV=$dev1 -setup_root_helper - run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f -m raid1 -d raid5 "${loopdevs[@]}" run_check_mount_test_dev @@ -26,6 +26,6 @@ run_check $SUDO_HELPER dd if=/dev/urandom of="$TEST_MNT/file" bs=16K count=1 \ run_check_umount_test_dev # Check data csum should not report false alerts -run_check "$TOP/btrfs" check --check-data-csum "$dev1" +run_check $SUDO_HELPER "$TOP/btrfs" check --check-data-csum "$dev1" cleanup_loopdevs