summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2021-03-22 10:15:08 +0100
committerZdenek Kabelac <zkabelac@redhat.com>2021-03-22 22:36:37 +0100
commit77432ee13742d09af5e8b1f8813d65bda3556a1d (patch)
treeb8ca6ffa9d53ae53bc200ff7e66e1d9f5ac2852c
parentdaca6e2c225889a8ee4bfe4f4724d92481df2558 (diff)
downloadlvm2-77432ee13742d09af5e8b1f8813d65bda3556a1d.tar.gz
tests: remove local changes
Use aux for preparing profile. Avoid playing with LVM_BINARY localy - we already preset this variable in lib/utils.
-rw-r--r--test/api/dbustest.sh13
1 files changed, 1 insertions, 12 deletions
diff --git a/test/api/dbustest.sh b/test/api/dbustest.sh
index f7d2e91a8..d922d903f 100644
--- a/test/api/dbustest.sh
+++ b/test/api/dbustest.sh
@@ -28,18 +28,7 @@ aux extend_filter_LVMTEST
# We need the lvmdbusd.profile for the daemon to utilize JSON
# output
-mkdir -p "$TESTDIR/etc/profile"
-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_profiles "lvmdbusd"
aux prepare_lvmdbusd