diff options
| author | Petr Rockai <prockai@redhat.com> | 2014-09-15 00:19:53 +0200 |
|---|---|---|
| committer | Petr Rockai <prockai@redhat.com> | 2015-02-05 13:47:21 +0100 |
| commit | bd0806e1f53f4b978cf298885e1d98365011ec3e (patch) | |
| tree | 23d8236e508bdc68fb3dcf5b60e3b59324ce3441 | |
| parent | c6f9c4622378a312f0195ab968f8744b881d10b5 (diff) | |
| download | lvm2-bd0806e1f53f4b978cf298885e1d98365011ec3e.tar.gz | |
test: Fix failures due to undefined abs_top_builddir.
| -rw-r--r-- | test/shell/000-basic.sh | 2 | ||||
| -rw-r--r-- | test/shell/dmeventd-restart.sh | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/test/shell/000-basic.sh b/test/shell/000-basic.sh index 7ad4d9f05..027969e36 100644 --- a/test/shell/000-basic.sh +++ b/test/shell/000-basic.sh @@ -13,6 +13,8 @@ lvm version +test -n "$abs_top_builddir" || skip + v=$abs_top_builddir/lib/misc/lvm-version.h sed -n "/#define LVM_VERSION ./s///p" "$v" | sed "s/ .*//" > expected diff --git a/test/shell/dmeventd-restart.sh b/test/shell/dmeventd-restart.sh index a94ede180..4344e8234 100644 --- a/test/shell/dmeventd-restart.sh +++ b/test/shell/dmeventd-restart.sh @@ -43,7 +43,10 @@ not pgrep dmeventd rm LOCAL_DMEVENTD # set dmeventd path -aux lvmconf "dmeventd/executable=\"$abs_top_builddir/test/lib/dmeventd\"" +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 dmeventd >LOCAL_DMEVENTD not grep 'already monitored' lvchange.out |