From d2cc708650a2555fffea77cc3c446427f9e8da57 Mon Sep 17 00:00:00 2001 From: Jakub Sztandera Date: Wed, 12 Jul 2017 20:48:21 +0200 Subject: [PATCH] make(sharness): add plugins as part of sharness build License: MIT Signed-off-by: Jakub Sztandera --- Rules.mk | 6 ++++-- mk/util.mk | 1 + test/sharness/.gitignore | 1 + test/sharness/Rules.mk | 15 ++++++++++++++- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Rules.mk b/Rules.mk index 24b00231f..ca9d1bf25 100644 --- a/Rules.mk +++ b/Rules.mk @@ -27,6 +27,10 @@ export IPFS_REUSEPORT=false dir := bin include $(dir)/Rules.mk +# tests need access to rules from plugin +dir := plugin +include $(dir)/Rules.mk + dir := test include $(dir)/Rules.mk @@ -56,8 +60,6 @@ include $(dir)/Rules.mk dir := pin/internal/pb include $(dir)/Rules.mk -dir := plugin -include $(dir)/Rules.mk # -------------------- # # universal rules # diff --git a/mk/util.mk b/mk/util.mk index 05e2dbe75..67b94f952 100644 --- a/mk/util.mk +++ b/mk/util.mk @@ -1,4 +1,5 @@ # util functions +OS ?= $(shell sh -c 'uname -s 2>/dev/null || echo not') ifeq ($(OS),Windows_NT) WINDOWS :=1 ?exe :=.exe # windows compat diff --git a/test/sharness/.gitignore b/test/sharness/.gitignore index 5e59048ac..06ceccc75 100644 --- a/test/sharness/.gitignore +++ b/test/sharness/.gitignore @@ -1,3 +1,4 @@ lib/sharness/ test-results/ trash directory.*.sh/ +plugins diff --git a/test/sharness/Rules.mk b/test/sharness/Rules.mk index 916f376c1..188cb50cb 100644 --- a/test/sharness/Rules.mk +++ b/test/sharness/Rules.mk @@ -1,6 +1,5 @@ include mk/header.mk - SHARNESS_$(d) = $(d)/lib/sharness/sharness.sh T_$(d) = $(sort $(wildcard $(d)/t[0-9][0-9][0-9][0-9]-*.sh)) @@ -12,6 +11,20 @@ DEPS_$(d) += cmd/ipfs/ipfs DEPS_$(d) += $(d)/clean-test-results DEPS_$(d) += $(SHARNESS_$(d)) +ifeq ($(OS),Linux) +PLUGINS_DIR_$(d) := $(d)/plugins/ +ORGIN_PLUGINS_$(d) := $(plugin/plugins_plugins_so) +PLUGINS_$(d) := $(addprefix $(PLUGINS_DIR_$(d)),$(notdir $(ORGIN_PLUGINS_$(d)))) + +$(PLUGINS_$(d)): $(ORGIN_PLUGINS_$(d)) + @mkdir -p $(@D) + cp -f plugin/plugins/$(@F) $@ + +ifneq ($(TEST_NO_PLUGIN),1) +DEPS_$(d) += $(PLUGINS_$(d)) +endif +endif + export MAKE_SKIP_PATH=1 $(T_$(d)): $$(DEPS_$(d)) # use second expansion so coverage can inject dependency