tests: fix LD_PRELOAD tricks in Makefile to fix make check

fixup! 0118441e60ca2937790bd65526b2a07edd73b2c4 which broke
make check on systemd without libkres in library path.

diff --git a/bench/bench.mk b/bench/bench.mk
index dfd06ee767337e5fd37c8bee77f436f9dd08d0b4..e85744b5076510f3cdd6e5eda4b988424327da8a 100644 (file)
--- a/bench/bench.mk
+++ b/bench/bench.mk
@@ -5,13 +5,6 @@ bench_BIN := \
 bench_DEPEND := $(libkres)
 bench_LIBS :=  $(libkres_TARGET) $(libkres_LIBS)
 
-# Platform-specific library injection
-ifeq ($(PLATFORM),Darwin)
-       preload_syms := DYLD_FORCE_FLAT_NAMESPACE=1 DYLD_LIBRARY_PATH="$(DYLD_LIBRARY_PATH):$(abspath lib)"
-else
-       preload_syms := LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(abspath lib)"
-endif
-
 # Make bench binaries
 define make_bench
 $(1)_CFLAGS := -fPIE

diff --git a/tests/test_integration.mk b/tests/test_integration.mk
index 7c4e53a134f91440395b26574b84d02c32726220..a5d36c369ec7226e2a9a0fdb20f2f788deadf805 100644 (file)
--- a/tests/test_integration.mk
+++ b/tests/test_integration.mk
@@ -8,13 +8,6 @@ SUBMODULES_DIRTY := $(shell git submodule status --recursive | cut -c 1 | grep -
 REAL_PREFIX=$(realpath $(PREFIX))
 REAL_CURDIR=$(realpath $(CURDIR))
 
-# Platform-specific library injection
-ifeq ($(PLATFORM),Darwin)
-       preload_syms := DYLD_FORCE_FLAT_NAMESPACE=1 DYLD_LIBRARY_PATH="$(abspath $(LIBDIR)):$(DYLD_LIBRARY_PATH)"
-else
-       preload_syms := LD_LIBRARY_PATH="$(abspath $(LIBDIR)):$(LD_LIBRARY_PATH)"
-endif
-
 # Integration tests from Deckard repo
 deckard_DIR := $(TOPSRCDIR)/tests/deckard
 

diff --git a/tests/tests.mk b/tests/tests.mk
index 282fcf26f18a50f017dfb65a00ec4ab2b0694285..91edbb3986ea757d2b451a85a907e503c433189b 100644 (file)
--- a/tests/tests.mk
+++ b/tests/tests.mk
@@ -1,3 +1,10 @@
+# Platform-specific library injection
+ifeq ($(PLATFORM),Darwin)
+       preload_syms := DYLD_FORCE_FLAT_NAMESPACE=1 DYLD_LIBRARY_PATH="$(abspath lib):$(DYLD_LIBRARY_PATH)"
+else
+       preload_syms := LD_LIBRARY_PATH="$(abspath lib):$(LD_LIBRARY_PATH)"
+endif
+
 # Unit tests
 ifeq ($(HAS_cmocka), yes)
 include tests/unit.mk