Skip to contentSkip to conversation

btrfs-progs: fix path for btrfs-corrupt-block

PATCH In review Long An 2 participants 2 messages Jan 10, 2020 – Jan 13, 2020 Btrfs file system

lore
Share & tools
lore

Long An

author
#0 lore raw

PATCH 1/1 btrfs-progs: fix path for btrfs-corrupt-block

btrfs-corrupt-block path is wrong on exported testsutie. Fix this issue for below tests:
fsck-tests/037-freespacetree-repair misc-tests/038-backup-root-corruption

---
 tests/fsck-tests/037-freespacetree-repair/test.sh   | 2 +-
 tests/misc-tests/038-backup-root-corruption/test.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
(quoted diff) +0 -0

b/tests/fsck-tests/037-freespacetree-repair/test.sh index d7ee0f21..49165fcd 100755

tests/fsck-tests/037-freespacetree-repair/test.sh +0 -1
@@ -46,7 +46,7 @@ corrupt_fst_item()
                _fail "Unknown item type for corruption"
        fi
 
-       run_check "$TOP/btrfs-corrupt-block" -r 10 -K

"$objectid,$type,$offset" \
+ run_check "$INTERNAL_BIN/btrfs-corrupt-block" -r 10 -K
"$objectid,$type,$offset" \
-f offset "$TEST_DEV"
}

(quoted diff) +0 -0

b/tests/misc-tests/038-backup-root-corruption/test.sh index f15d0bba..a970691b 100755

tests/misc-tests/038-backup-root-corruption/test.sh +0 -0
@@ -27,7 +27,7 @@ main_root_ptr=$(dump_super | grep root | head -n1 |

awk '{print $2}')

[ "$backup2_root_ptr" -eq "$main_root_ptr" ] || _fail "Backup slot 2
is not in use"

-run_check "$TOP/btrfs-corrupt-block" -m $main_root_ptr -f generation "$TEST_DEV"
+run_check "$INTERNAL_BIN/btrfs-corrupt-block" -m $main_root_ptr -f generation "$TEST_DEV"

# Should fail because the root is corrupted
run_mustfail "Unexpected successful mount" \
--
2.16.4

#1 lore raw
Quoted 4 lines · Long An

btrfs-corrupt-block path is wrong on exported testsutie. Fix this issue for below tests:
fsck-tests/037-freespacetree-repair misc-tests/038-backup-root-corruption

Thanks, btrfs-corrupt-block and fssum need to be handled specially for the testsuite. I found one more test (fsck-tests/013-extent-tree-rebuild) with wrong path so fixed it as well.