diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2015-10-26 20:09:47 +0100 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2015-10-26 23:57:47 +0100 |
| commit | a2dd1f6e191de8d0ba1292e01338d480958c5a0a (patch) | |
| tree | 92a9c9e53858275ed96c2423805dc93c4fb92353 | |
| parent | c301cc5d3840e1badd015164e0dcabfacc8f9599 (diff) | |
| download | lvm2-a2dd1f6e191de8d0ba1292e01338d480958c5a0a.tar.gz | |
tests: support skip flags
| -rw-r--r-- | test/lib/inittest.sh | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/test/lib/inittest.sh b/test/lib/inittest.sh index 28bc4e8e6..beb0210eb 100644 --- a/test/lib/inittest.sh +++ b/test/lib/inittest.sh @@ -25,6 +25,15 @@ unset CDPATH # grab some common utilities . lib/utils +if test -n "$LVM_TEST_FLAVOUR"; then + . lib/flavour-$LVM_TEST_FLAVOUR +fi + +test -n "$SKIP_WITHOUT_CLVMD" && test "$LVM_TEST_LOCKING" -ne 3 && skip +test -n "$SKIP_WITHOUT_LVMETAD" && test -z "$LVM_TEST_LVMETAD" && skip +test -n "$SKIP_WITH_LVMPOLLD" && test -n "$LVM_TEST_LVMPOLLD" && skip + + TESTOLDPWD=$(pwd) COMMON_PREFIX="LVMTEST" PREFIX="${COMMON_PREFIX}$$" @@ -54,10 +63,6 @@ test -n "$abs_top_builddir" && \ find "$TESTOLDPWD/lib" ! \( -name '*.sh' -o -name '*.[cdo]' \ -o -name '*~' \) -exec ln -s -t lib "{}" + -if test -n "$LVM_TEST_FLAVOUR"; then - . lib/flavour-$LVM_TEST_FLAVOUR -fi - DM_DEFAULT_NAME_MANGLING_MODE=none DM_DEV_DIR="$TESTDIR/dev" LVM_SYSTEM_DIR="$TESTDIR/etc" |