From a51c68aacb7b58c3d8dbf7e13d11432021fdff97 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Tue, 11 Jul 2023 15:48:15 +0200 Subject: [PATCH] tests: makefile build proper tools list Add compiled components to the list. --- test/Makefile.in | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/test/Makefile.in b/test/Makefile.in index 88681b5b2..20e97ebd0 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -53,15 +53,25 @@ comma = , RUN := $(shell find -L $(srcdir) -regextype posix-egrep \( -path \*/shell/\*.sh -or -path \*/api/\*.sh -or -path \*/unit/\*.sh \) -and -regex "$(srcdir)/.*($(subst $(comma),|,$(T))).*" -and -not -regex "$(srcdir)/.*($(subst $(comma),|,$(S))).*" | $(SORT)) RUN_BASE = $(subst $(srcdir)/,,$(RUN)) +ifeq ("@BUILD_DMEVENTD@", "yes") +DMEVENTD_TOOLS :=\ + daemons/dmeventd/dmeventd +endif + ifeq ("@BUILD_LVMPOLLD@", "yes") LVMPOLLD_RUN_BASE = $(RUN_BASE) LVMPOLLD_NDEV_FLAVOUR = ,ndev-lvmpolld LVMPOLLD_UDEV_FLAVOUR = ,udev-lvmpolld +LVMPOLLD_TOOLS :=\ + daemons/lvmpolld/lvmpolld endif ifeq ("@BUILD_LVMLOCKD@", "yes") LVMLOCKD_RUN_BASE = $(RUN_BASE) LVMLOCKD_UDEV_FLAVOUR = ,udev-lvmlockd-test +LVMLOCKD_TOOLS :=\ + daemons/lvmlockd/lvmlockd\ + daemons/lvmlockd/lvmlockctl endif # Shell quote; @@ -204,9 +214,10 @@ LIB_LVMLOCKD_CONF :=\ LIB_MKE2FS_CONF := mke2fs.conf -LVM_TOOLS :=\ - daemons/dmeventd/dmeventd\ - daemons/lvmpolld/lvmpolld\ +LVM_TOOLS := \ + $(LVMPOLLD_TOOLS)\ + $(LVMLOCKD_TOOLS)\ + $(DMEVENTD_TOOLS)\ libdm/dm-tools/dmsetup LVM_PROFILES := $(addsuffix .profile,\