shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

test: Fix condition when detecting lvmdbusd

Browse Source
This commit is contained in:
Marian Csontos 2017-12-12 14:18:27 +01:00
parent c5ef76bf27
commit 15ccea7111
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/lib/aux.sh
View File

@ -324,10 +324,13 @@ prepare_lvmdbusd() {
echo ok
# skip if we don't have our own lvmdbusd...
echo -n "## find lvmdbusd to use..."
if test -z "${installed_testsuite+varset}"; then
# NOTE: this is always present - additional checks are needed:
daemon="$abs_top_builddir/daemons/lvmdbusd/lvmdbusd"
if ! test -x "$daemon" && chmod ugo+x "$daemon"; then
if test -x "$daemon" || chmod ugo+x "$daemon"; then
echo "$daemon"
else
echo "Failed to make '$daemon' executable">&2
return 1
fi
@ -335,6 +338,7 @@ prepare_lvmdbusd() {
export PYTHONPATH="$abs_top_builddir/daemons"
else
daemon=$(which lvmdbusd || :)
echo "$daemon"
fi
test -x "$daemon" || skip "The lvmdbusd daemon is missing"
which python3 >/dev/null || skip "Missing python3"