tests: moved integration deps

diff --git a/tests/integration.mk b/tests/integration.mk
index 6d0ecc0e4e9db83ce2fce3be35a9d7b5ecb9b255..04c468e2650e97c28defa6738fed43fdb5a11fea 100644 (file)
--- 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 5933c8cc111ae138f0b5e37a08a42ed86cfeba0f..5ee596aa46739a2d0e565bb322d543b8b68fc9d1 100644 (file)
--- 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