From 4f9d8b1ffafd4ce1bf1c4c805a22bd089ade9861 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Fri, 12 Dec 2014 15:49:26 +0100 Subject: [PATCH] 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 --- Makefile | 2 +- tests/fsck-tests.sh | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 04d2c37d..e1b0a88c 100644 --- a/Makefile +++ b/Makefile @@ -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