btrfs-progs: tests: Fix missing internal deps in check and misc tests
Doing a straight 'make test' would fail because some misc and fsck tests require particular tools to already be built. Add dependencies at the Makefile and shell-script level. Signed-off-by: Adam Buchbinder <abuchbinder@google.com> Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
parent
b7df24aa5c
commit
50d037b459
5
Makefile
5
Makefile
|
@ -272,11 +272,12 @@ test-convert: btrfs btrfs-convert
|
|||
$(Q)bash tests/convert-tests.sh
|
||||
|
||||
test-check: test-fsck
|
||||
test-fsck: btrfs btrfs-image btrfs-corrupt-block mkfs.btrfs
|
||||
test-fsck: btrfs btrfs-image btrfs-corrupt-block mkfs.btrfs btrfstune
|
||||
@echo " [TEST] fsck-tests.sh"
|
||||
$(Q)bash tests/fsck-tests.sh
|
||||
|
||||
test-misc: btrfs btrfs-image btrfs-corrupt-block mkfs.btrfs btrfstune fssum
|
||||
test-misc: btrfs btrfs-image btrfs-corrupt-block mkfs.btrfs btrfstune fssum \
|
||||
btrfs-zero-log btrfs-find-root btrfs-select-super
|
||||
@echo " [TEST] misc-tests.sh"
|
||||
$(Q)bash tests/misc-tests.sh
|
||||
|
||||
|
|
|
@ -23,6 +23,7 @@ rm -f "$RESULTS"
|
|||
check_prereq btrfs-corrupt-block
|
||||
check_prereq btrfs-image
|
||||
check_prereq btrfs
|
||||
check_prereq btrfstune
|
||||
check_kernel_support
|
||||
|
||||
run_one_test() {
|
||||
|
|
|
@ -24,6 +24,9 @@ check_prereq btrfs-corrupt-block
|
|||
check_prereq btrfs-image
|
||||
check_prereq btrfstune
|
||||
check_prereq btrfs
|
||||
check_prereq btrfs-zero-log
|
||||
check_prereq btrfs-find-root
|
||||
check_prereq btrfs-select-super
|
||||
check_kernel_support
|
||||
|
||||
# The tests are driven by their custom script called 'test.sh'
|
||||
|
|
Loading…
Reference in New Issue