1
0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00

tests: configure use_lvmetad when needed

This commit is contained in:
Zdenek Kabelac 2015-05-01 22:40:58 +02:00
parent 6a171bbdf5
commit abdfb1e75b
2 changed files with 5 additions and 3 deletions

View File

@ -94,6 +94,9 @@ prepare_lvmetad() {
kill_sleep_kill_ LOCAL_LVMETAD ${LVM_VALGRIND_LVMETAD:-0}
# Avoid reconfiguring, if already set to use_lvmetad
(grep use_lvmetad CONFIG_VALUES 2>/dev/null | tail -1 | grep -q 1) || \
aux lvmconf "global/use_lvmetad = 1" "devices/md_component_detection = 0"
# Default debug is "-l all" and could be override
# by setting LVM_TEST_LVMETAD_DEBUG_OPTS before calling inittest.
echo "preparing lvmetad..."

View File

@ -92,7 +92,6 @@ echo "@PREFIX=$PREFIX"
if test -n "$LVM_TEST_LVMETAD" ; then
export LVM_LVMETAD_SOCKET="$TESTDIR/lvmetad.socket"
export LVM_LVMETAD_PIDFILE="$TESTDIR/lvmetad.pid"
aux lvmconf "global/use_lvmetad = 1" "devices/md_component_detection = 0"
aux prepare_lvmetad
else
# lvmetad prepares its own lvmconf