test: Make lvm-wrapper available in the installed testsuite, too.

diff --git a/test/Makefile.in b/test/Makefile.in
index 690e7e45720be13f8956609ac2bb1594aae8761c..e0652e128a5cbd9a040dce9054608b8ac113bd2d 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -145,6 +145,7 @@ install: .tests-stamp lib/paths-installed
        $(INSTALL_DATA) lib/paths-installed $(DATADIR)/lib/paths
        $(INSTALL_DATA) $(LIB_FLAVOURS) $(DATADIR)/lib/
        $(INSTALL_SCRIPT) $(LIB_SHARED) $(DATADIR)/lib/
+       for i in $(CMDS); do (cd $(DATADIR)/lib && ln -fs lvm-wrapper $$i); done
 
        $(INSTALL_DIR) $(EXECDIR)
        $(INSTALL_PROGRAM) $(LIB_EXEC) $(EXECDIR)

diff --git a/test/lib/lvm-wrapper.sh b/test/lib/lvm-wrapper.sh
index 082c6405be4dd33b1f56fe2d422434e2a873e19f..013bc13997c4286f04782260df77b79a93f2a5d8 100644 (file)
--- a/test/lib/lvm-wrapper.sh
+++ b/test/lib/lvm-wrapper.sh
@@ -36,4 +36,9 @@ if test -n "$LVM_VALGRIND"; then
 fi
 
 # the exec is important, because otherwise fatal signals inside "not" go unnoticed
-exec $RUN_VALGRIND "$abs_top_builddir/tools/lvm" $CMD "$@"
+if test -n "$abs_top_builddir"; then
+    exec $RUN_DBG "$abs_top_builddir/tools/lvm" $CMD "$@"
+else # we are testing the lvm on $PATH
+    PATH=`echo $PATH | sed -e s,[^:]*lvm2-testsuite[^:]*:,,g`
+    exec $RUN_DBG lvm $CMD "$@"
+fi