From ee29dd2811f6d10b99c9dd58878434957c83f194 Mon Sep 17 00:00:00 2001 From: "Igor Mikhailov (imichail)" Date: Tue, 9 May 2017 23:27:14 -0700 Subject: Generate test paths for lib and lib64 subdirectories wildcard produces empty paths when 'make test' is run from a clean tree: install--native directories don't exist yet. Change-Id: I3b3bbd86cf7eda18f2c698f85b834f82b1a19065 Signed-off-by: Igor Mikhailov (imichail) --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b344f377..6a128fa8 100644 --- a/Makefile +++ b/Makefile @@ -257,15 +257,18 @@ rebuild-release: wipe-release build-release export VPP_PYTHON_PREFIX=$(BR)/python +libexpand = $(subst $(subst ,, ),:,$(foreach lib,$(1),$(BR)/install-$(2)-native/vpp/$(lib)/$(3))) + define test $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install,) + $(eval libs:=lib lib64) make -C test \ TEST_DIR=$(WS_ROOT)/test \ VPP_TEST_BUILD_DIR=$(BR)/build-$(2)-native \ VPP_TEST_BIN=$(BR)/install-$(2)-native/vpp/bin/vpp \ - VPP_TEST_PLUGIN_PATH=$(wildcard $(BR)/install-$(2)-native/vpp/lib*/vpp_plugins) \ + VPP_TEST_PLUGIN_PATH=$(call libexpand,$(libs),$(2),vpp_plugins) \ VPP_TEST_INSTALL_PATH=$(BR)/install-$(2)-native/ \ - LD_LIBRARY_PATH=$(subst $(subst ,, ),:,$(wildcard $(BR)/install-$(2)-native/vpp/lib*/)) \ + LD_LIBRARY_PATH=$(call libexpand,$(libs),$(2),) \ EXTENDED_TESTS=$(EXTENDED_TESTS) \ PYTHON=$(PYTHON) \ $(3) -- cgit 1.2.3-korg