diff options
| author | Adam Buchbinder <abuchbinder@google.com> | 2017-07-10 14:29:08 -0700 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-07-20 17:43:43 +0200 |
| commit | 50d037b4590ea8eea376d19ad89c152776b4225c (patch) | |
| tree | 1c1792dd3780fe152307e0592e22d9c89c22bc1e | |
| parent | b7df24aa5cddc4802b9938f56372b73869775cd9 (diff) | |
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>
| -rw-r--r-- | Makefile | 5 | ||||
| -rwxr-xr-x | tests/fsck-tests.sh | 1 | ||||
| -rwxr-xr-x | tests/misc-tests.sh | 3 |
3 files changed, 7 insertions, 2 deletions
@@ -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 diff --git a/tests/fsck-tests.sh b/tests/fsck-tests.sh index 44cca1b8..15d26c70 100755 --- a/tests/fsck-tests.sh +++ b/tests/fsck-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() { diff --git a/tests/misc-tests.sh b/tests/misc-tests.sh index 1c645c9b..08988016 100755 --- a/tests/misc-tests.sh +++ b/tests/misc-tests.sh @@ -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' |