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

tests: move conf preparing

Browse Source 
If the test in the middle is restarting lvmetad
avoid conf regenerating.
This commit is contained in:
Zdenek Kabelac 2015-04-30 13:57:54 +02:00
parent 0eea780bce
commit c18e969e30
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/lib/aux.sh
View File

@ -90,8 +90,6 @@ prepare_lvmetad() {
if test -z "${installed_testsuite+varset}"; then
(which lvmetad 2>/dev/null | grep -q "$abs_builddir") || skip
fi
lvmconf "global/use_lvmetad = 1" \
"devices/md_component_detection = 0"
local run_valgrind=
test "${LVM_VALGRIND_LVMETAD:-0}" -eq 0 || run_valgrind="run_valgrind"

1
test/lib/inittest.sh
View File

@ -92,6 +92,7 @@ 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