mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-22 17:35:59 +03:00
tests: remove local changes
Use aux for preparing profile. Avoid playing with LVM_BINARY localy - we already preset this variable in lib/utils.
This commit is contained in:
parent
daca6e2c22
commit
77432ee137
@ -28,18 +28,7 @@ aux extend_filter_LVMTEST
|
|||||||
|
|
||||||
# We need the lvmdbusd.profile for the daemon to utilize JSON
|
# We need the lvmdbusd.profile for the daemon to utilize JSON
|
||||||
# output
|
# output
|
||||||
mkdir -p "$TESTDIR/etc/profile"
|
aux prepare_profiles "lvmdbusd"
|
||||||
cp -v "$TESTOLDPWD/lib/lvmdbusd.profile" "$TESTDIR/etc/profile/"
|
|
||||||
|
|
||||||
# Need to set this up so that the lvmdbusd service knows which
|
|
||||||
# binary to be running, which should be the one we just built
|
|
||||||
LVM_BINARY=$(which lvm 2>/dev/null)
|
|
||||||
export LVM_BINARY
|
|
||||||
|
|
||||||
# skip if we don't have our own lvmetad...
|
|
||||||
if test -z "${installed_testsuite+varset}"; then
|
|
||||||
(echo "$LVM_BINARY" | grep -q "$abs_builddir") || skip
|
|
||||||
fi
|
|
||||||
|
|
||||||
aux prepare_lvmdbusd
|
aux prepare_lvmdbusd
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user