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

test: correcting binary usage

Ensure 'test suite' run uses fsadm and dmeventd from compiled dir,
while for 'rpm' installed test use binaries installed in system.
This commit is contained in:
Zdenek Kabelac 2017-04-14 01:03:18 +02:00
parent 15c3ad9641
commit aa25cfe084
2 changed files with 8 additions and 6 deletions

View File

@ -1157,7 +1157,6 @@ global/thin_repair_executable = "$LVM_TEST_THIN_REPAIR_CMD"
global/use_lvmetad = $LVM_TEST_LVMETAD
global/use_lvmpolld = $LVM_TEST_LVMPOLLD
global/use_lvmlockd = $LVM_TEST_LVMLOCKD
global/fsadm_executable = "$TESTDIR/lib/fsadm"
log/activation = 1
log/file = "$TESTDIR/debug.log"
log/indent = 1
@ -1166,6 +1165,14 @@ log/overwrite = 1
log/syslog = 0
log/verbose = 0
EOF
# For 'rpm' builds use system installed binaries.
# For test suite run use binaries from builddir.
test -z "${abs_top_builddir+varset}" || {
cat >> "$config_values" <<-EOF
dmeventd/executable = "$abs_top_builddir/test/lib/dmeventd"
global/fsadm_executable = "$abs_top_builddir/test/lib/fsadm"
EOF
}
}
local v

View File

@ -45,11 +45,6 @@ sleep 7
not pgrep dmeventd
rm LOCAL_DMEVENTD
# set dmeventd path
if test -n "$abs_top_builddir"; then
aux lvmconf "dmeventd/executable=\"$abs_top_builddir/test/lib/dmeventd\""
fi
lvchange --monitor y --verbose $vg/3way 2>&1 | tee lvchange.out
pgrep -o dmeventd >LOCAL_DMEVENTD
not grep 'already monitored' lvchange.out