diff options
| author | David Sterba <dsterba@suse.cz> | 2014-12-12 15:49:26 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2014-12-12 16:21:42 +0100 |
| commit | 4f9d8b1ffafd4ce1bf1c4c805a22bd089ade9861 (patch) | |
| tree | 30a6e8fb3782a30d79c0dd0b60a4f496f04e223b | |
| parent | 6856b0a4cab6eae794f0fe012391fa76a8dd3b4e (diff) | |
btrfs-progs: tests: build prerequisities, btrfs-image and btrfs
Build required utilities from the main Makefile and just check in the
test scripts.
Signed-off-by: David Sterba <dsterba@suse.cz>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | tests/fsck-tests.sh | 11 |
2 files changed, 11 insertions, 2 deletions
@@ -140,7 +140,7 @@ $(BUILDDIRS): @echo "Making all in $(patsubst build-%,%,$@)" $(Q)$(MAKE) $(MAKEOPTS) -C $(patsubst build-%,%,$@) -test: +test: btrfs btrfs-convert btrfs-image btrfs-corrupt-block $(Q)for t in $(TESTS); do \ echo " [TEST] $$t"; \ bash tests/$$t || exit 1; \ diff --git a/tests/fsck-tests.sh b/tests/fsck-tests.sh index 285bcf65..24fb1090 100644 --- a/tests/fsck-tests.sh +++ b/tests/fsck-tests.sh @@ -22,10 +22,19 @@ run_check() "$@" >> $RESULT 2>&1 || _fail "failed: $@" } +check_prereq() +{ + if ! [ -f $here/$1 ]; then + _fail "Failed prerequisities: $1"; + fi +} + rm -f $RESULT # test rely on corrupting blocks tool -run_check make btrfs-corrupt-block +check_prereq btrfs-corrupt-block +check_prereq btrfs-image +check_prereq btrfs # Some broken filesystem images are kept as .img files, created by the tool # btrfs-image, and others are kept as .tar.xz files that contain raw filesystem |