[lvm-devel] master - tests: hide unwanted output

Zdenek Kabelac zkabelac at fedoraproject.org
Mon Apr 13 14:39:30 UTC 2015


Gitweb:        http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=f080ebc123a050eff1de3995d7da8c835c4dc6e7
Commit:        f080ebc123a050eff1de3995d7da8c835c4dc6e7
Parent:        391500643cdf7b43783212c87b6b46291e701afa
Author:        Zdenek Kabelac <zkabelac at redhat.com>
AuthorDate:    Mon Apr 13 14:19:54 2015 +0200
Committer:     Zdenek Kabelac <zkabelac at redhat.com>
CommitterDate: Mon Apr 13 16:38:31 2015 +0200

tests: hide unwanted output

---
 test/lib/aux.sh |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/lib/aux.sh b/test/lib/aux.sh
index f471fa4..a5d620a 100644
--- a/test/lib/aux.sh
+++ b/test/lib/aux.sh
@@ -31,13 +31,13 @@ prepare_clvmd() {
 	fi
 
 	# skip if we don't have our own clvmd...
-	(which clvmd 2>/dev/null | grep "$abs_builddir") || skip
+	(which clvmd 2>/dev/null | grep -q "$abs_builddir") || skip
 	# lvs is executed from clvmd - use our version
 	export LVM_BINARY=$(which lvm)
 
-	test -e "$DM_DEV_DIR/control" || dmsetup table # create control node
+	test -e "$DM_DEV_DIR/control" || dmsetup table >/dev/null # create control node
 	# skip if singlenode is not compiled in
-	(clvmd --help 2>&1 | grep "Available cluster managers" | grep "singlenode") || skip
+	(clvmd --help 2>&1 | grep "Available cluster managers" | grep -q "singlenode") || skip
 
 #	lvmconf "activation/monitoring = 1"
 	local run_valgrind=




More information about the lvm-devel mailing list