From: Adam Buchbinder <abuchbinder@google.com>
To: linux-btrfs@vger.kernel.org
Cc: abuchbinder@google.com
Subject: [PATCH] btrfs-progs: Fix missing internal deps in tests.
Date: Mon, 10 Jul 2017 14:29:08 -0700 [thread overview]
Message-ID: <20170710212909.31559-1-abuchbinder@google.com> (raw)
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>
---
Makefile | 5 +++--
tests/fsck-tests.sh | 1 +
tests/misc-tests.sh | 3 +++
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 81598df..4669525 100644
--- a/Makefile
+++ b/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
diff --git a/tests/fsck-tests.sh b/tests/fsck-tests.sh
index 44cca1b..15d26c7 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 1c645c9..0898801 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'
--
2.13.2.725.g09c95d1e9-goog
next reply other threads:[~2017-07-10 21:29 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-10 21:29 Adam Buchbinder [this message]
2017-07-10 21:29 ` [PATCH] btrfs-progs: Tighten integer types in print-tree Adam Buchbinder
2017-07-12 22:26 ` David Sterba
2017-07-12 22:24 ` [PATCH] btrfs-progs: Fix missing internal deps in tests David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170710212909.31559-1-abuchbinder@google.com \
--to=abuchbinder@google.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).