From: Marek Vavruša <marek.vavrusa@nic.cz>
Date: Mon, 14 Sep 2015 13:25:21 +0000 (+0200)
Subject: tests: unit tests don't require preloaded libs
X-Git-Tag: v1.0.0-beta1~53^2~81^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e5d21267f718f5bcf99ef5ddde8daafba1e0fe2;p=thirdparty%2Fknot-resolver.git

tests: unit tests don't require preloaded libs
---

diff --git a/tests/integration.mk b/tests/integration.mk
index 7c9307b63..685951244 100644
--- a/tests/integration.mk
+++ b/tests/integration.mk
@@ -27,6 +27,6 @@ $(libfaketime): $(libfaketime_DIR)/Makefile
 	@CFLAGS="" $(MAKE) -C $(libfaketime_DIR)
 
 check-integration: $(libfaketime)
-	$(preload_LIBS) $(preload_syms) tests/test_integration.py $(TESTS) $(abspath daemon/kresd) ./kresd.j2 config
+	@$(preload_LIBS) $(preload_syms) tests/test_integration.py $(TESTS) $(abspath daemon/kresd) ./kresd.j2 config
 
 .PHONY: check-integration
diff --git a/tests/tests.mk b/tests/tests.mk
index 870f749ba..b0fe33b9a 100644
--- a/tests/tests.mk
+++ b/tests/tests.mk
@@ -1,10 +1,10 @@
 # Preload libraries
 preload_PATH := $(abspath contrib/libfaketime/src)
 ifeq ($(PLATFORM),Darwin)
-	preload_LIBS := @DYLD_FORCE_FLAT_NAMESPACE=1 \
+	preload_LIBS := DYLD_FORCE_FLAT_NAMESPACE=1 \
 	                DYLD_LIBRARY_PATH="$(preload_PATH):${DYLD_LIBRARY_PATH}"
 else
-	preload_LIBS := @LD_LIBRARY_PATH="$(preload_PATH):${LD_LIBRARY_PATH}"
+	preload_LIBS := LD_LIBRARY_PATH="$(preload_PATH):${LD_LIBRARY_PATH}"
 endif
 
 # Unit tests
diff --git a/tests/unit.mk b/tests/unit.mk
index 3b69799d6..ade5a2027 100644
--- a/tests/unit.mk
+++ b/tests/unit.mk
@@ -30,13 +30,13 @@ $(1)_SOURCES := tests/$(1).c
 $(1)_LIBS := $(tests_LIBS)
 $(1)_DEPEND := $(tests_DEPEND)
 $(call make_bin,$(1),tests)
-$(1)-run: $$($(1))
-	$(call preload_LIBS) $$<
-.PHONY: $(1)-run
+$(1): $$($(1))
+	@$$<
+.PHONY: $(1)
 endef
 
 # Targets
 $(foreach test,$(tests_BIN),$(eval $(call make_test,$(test))))
-check-unit: $(foreach test,$(tests_BIN),$(test)-run)
+check-unit: $(foreach test,$(tests_BIN),$(test))
 
 .PHONY: check-unit