From: Marian Csontos <mcsontos@redhat.com>
Date: Fri, 1 Apr 2016 07:28:31 +0000 (+0200)
Subject: test: Fix testing of installed lvmdbusd
X-Git-Tag: v2_02_150~6
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=e6768997e192e26aaf091b6ed2700a3391f178b5;p=lvm2.git

test: Fix testing of installed lvmdbusd

If lvmdbusd is missing expression triggers ERR trap instead of skipping
the test.
---

diff --git a/test/lib/aux.sh b/test/lib/aux.sh
index c8985ede0..3a44ae6fd 100644
--- a/test/lib/aux.sh
+++ b/test/lib/aux.sh
@@ -321,7 +321,7 @@ prepare_lvmdbusd() {
 		# Setup the python path so we can run
 		export PYTHONPATH=$abs_top_builddir/daemons
 	else
-		daemon="$(which lvmdbusd)"
+		daemon="$(which lvmdbusd || :)"
 	fi
 	[[ -n $daemon && -x $daemon ]] || skip "The daemon is missing"