shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

tests: avoid dup of lvm.conf

Browse Source 
When running lvmetad test - avoid duplicate create of lvm.conf
Also as lvmetad cannot be used with cluster make it as 2 code paths.
This commit is contained in:
Zdenek Kabelac 2015-04-14 09:47:14 +02:00
parent ee6fc17663
commit c969e05aab
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/lib/inittest.sh
View File

@ -86,13 +86,15 @@ prepare_test_vars
test -n "$BASH" && set -eE -o pipefail
aux lvmconf
aux prepare_clvmd
test -n "$LVM_TEST_LVMETAD" && {
if test -n "$LVM_TEST_LVMETAD" ; then
export LVM_LVMETAD_SOCKET="$TESTDIR/lvmetad.socket"
export LVM_LVMETAD_PIDFILE="$TESTDIR/lvmetad.pid"
aux prepare_lvmetad
}
else
# lvmetad prepares its own lvmconf
aux lvmconf
aux prepare_clvmd
fi
# Vars for harness
echo "@TESTDIR=$TESTDIR"