summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2016-02-23 16:34:46 -0600
committerDavid Teigland <teigland@redhat.com>2016-02-23 16:34:46 -0600
commit77f034bfa3d85600ec9b9581c17352202ce09ae8 (patch)
treef8e21d4c79edf7fd0f07d9c083dfb6a123c7e5d0
parente79325308454814d968dd3e06cd261a269716675 (diff)
downloadlvm2-77f034bfa3d85600ec9b9581c17352202ce09ae8.tar.gz
tests: include lvmlockd in default make checkdev-dct-make-check
-rw-r--r--test/Makefile.in7
1 files changed, 6 insertions, 1 deletions
diff --git a/test/Makefile.in b/test/Makefile.in
index 6ed9b9e13..98f6cc9b1 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -54,6 +54,11 @@ LVMPOLLD_NDEV_FLAVOUR = ,ndev-lvmpolld,ndev-cluster-lvmpolld,ndev-lvmetad-lvmpol
LVMPOLLD_UDEV_FLAVOUR = ,udev-lvmpolld,udev-cluster-lvmpolld,udev-lvmetad-lvmpolld
endif
+ifeq ("@BUILD_LVMLOCKD@", "yes")
+LVMLOCKD_RUN_BASE = $(RUN_BASE)
+LVMLOCKD_UDEV_FLAVOUR = ,udev-lvmlockd-test
+endif
+
# Shell quote;
SHELL_PATH_SQ := $(subst ','\'',$(SHELL_PATH))
@@ -112,7 +117,7 @@ help:
check: .tests-stamp
VERBOSE=$(VERBOSE) ./lib/runner \
--testdir . --outdir $(LVM_TEST_RESULTS) \
- --flavours ndev-vanilla,ndev-cluster$(LVMETAD_NDEV_FLAVOUR)$(LVMPOLLD_NDEV_FLAVOUR) --only $(T) --skip $(S)
+ --flavours ndev-vanilla,ndev-cluster$(LVMETAD_NDEV_FLAVOUR)$(LVMPOLLD_NDEV_FLAVOUR)$(LVMLOCKD_UDEV_FLAVOUR) --only $(T) --skip $(S)
check_system: .tests-stamp
VERBOSE=$(VERBOSE) ./lib/runner \