diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2021-02-23 16:27:44 +0100 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2021-02-23 16:29:48 +0100 |
| commit | e2b693fbe6139b0b991ea84a3011a74586b3b702 (patch) | |
| tree | 1cda5feaed47d17f78b2ccf0421b6c3f9e0410b4 | |
| parent | 1f220e8d430f3ab94e3e85656a3f692c6dc4051f (diff) | |
| download | lvm2-e2b693fbe6139b0b991ea84a3011a74586b3b702.tar.gz | |
tests: update setting LVM_BINARY for testing
When testing is running on uninstealled system - prefer our own binary
in tests.
| -rw-r--r-- | test/lib/aux.sh | 2 | ||||
| -rw-r--r-- | test/lib/utils.sh | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/test/lib/aux.sh b/test/lib/aux.sh index 4b303474a..9449b86cf 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -177,7 +177,7 @@ prepare_clvmd() { echo "<======== Starting CLVMD ========>" echo -n "## preparing clvmd..." # lvs is executed from clvmd - use our version - LVM_LOG_FILE_EPOCH=CLVMD LVM_LOG_FILE_MAX_LINES=1000000 LVM_BINARY=$(which lvm) $run_valgrind clvmd -Isinglenode -d 1 -f & + LVM_LOG_FILE_EPOCH=CLVMD LVM_LOG_FILE_MAX_LINES=1000000 $run_valgrind clvmd -Isinglenode -d 1 -f & echo $! > LOCAL_CLVMD for i in {200..0} ; do diff --git a/test/lib/utils.sh b/test/lib/utils.sh index f01f5bdb0..f12a87990 100644 --- a/test/lib/utils.sh +++ b/test/lib/utils.sh @@ -280,10 +280,11 @@ if test -z "${installed_testsuite+varset}"; then *"$abs_top_builddir/test/lib"*) ;; *) PATH="$abs_top_builddir/test/lib:$abs_top_builddir/test/api:$PATH" + LVM_BINARY=$(which lvm) LD_LIBRARY_PATH=$(find -L "$abs_top_builddir/libdm/" "$abs_top_builddir/tools/"\ "$abs_top_builddir/daemons/" "$abs_top_builddir/liblvm/"\ -name "*.so" -printf "%h:")"$LD_LIBRARY_PATH" - export PATH LD_LIBRARY_PATH ;; + export PATH LD_LIBRARY_PATH LVM_BINARY ;; esac fi |