From 77f034bfa3d85600ec9b9581c17352202ce09ae8 Mon Sep 17 00:00:00 2001 From: David Teigland Date: Tue, 23 Feb 2016 16:34:46 -0600 Subject: [PATCH] tests: include lvmlockd in default make check --- test/Makefile.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 \ -- 2.43.5