From: Marek Vavruša <marek.vavrusa@nic.cz>
Date: Mon, 11 May 2015 07:31:58 +0000 (+0200)
Subject: tests: moved integration deps
X-Git-Tag: v1.0.0-beta1~182
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e5375ad038f2fc6665c678f31aba3e2f6df83a4;p=thirdparty%2Fknot-resolver.git

tests: moved integration deps
---

diff --git a/tests/integration.mk b/tests/integration.mk
index 6d0ecc0e4..04c468e26 100644
--- a/tests/integration.mk
+++ b/tests/integration.mk
@@ -15,7 +15,13 @@ _test_integration_DEPEND := $(libmock_calls)
 $(eval $(call make_shared,_test_integration,tests))
 
 # Targets
+ifeq ($(PLATFORM),Darwin)
+	preload_syms := DYLD_INSERT_LIBRARIES=tests/libmock_calls.dylib
+else
+	preload_syms := LD_PRELOAD=tests/libmock_cals.so
+endif
+
 check-integration: $(libmock_calls) $(_test_integration)
-	$(call preload_LIBS) tests/test_integration.py tests/testdata
+	$(call preload_LIBS) $(preload_syms) tests/test_integration.py tests/testdata
 
 .PHONY: check-integration
diff --git a/tests/tests.mk b/tests/tests.mk
index 5933c8cc1..5ee596aa4 100644
--- a/tests/tests.mk
+++ b/tests/tests.mk
@@ -2,11 +2,9 @@
 preload_PATH := tests
 ifeq ($(PLATFORM),Darwin)
 	preload_LIBS := @DYLD_FORCE_FLAT_NAMESPACE=1 \
-	                DYLD_INSERT_LIBRARIES=tests/libmock_calls.dylib \
 	                DYLD_LIBRARY_PATH="$(preload_PATH):${DYLD_LIBRARY_PATH}"
 else
-	preload_LIBS := @LD_LIBRARY_PATH="$(preload_PATH):${LD_LIBRARY_PATH}" \
-	                LD_PRELOAD=tests/libmock_calls.so
+	preload_LIBS := @LD_LIBRARY_PATH="$(preload_PATH):${LD_LIBRARY_PATH}"
 endif
 
 # Unit tests