Some find it confusing that environment variables are set when shared

[openssl.git] / test / Makefile.ssl

diff --git a/test/Makefile.ssl b/test/Makefile.ssl
index b5c23a639f8e7ced6b31061feea323c0391af6aa..f3a7b58f4c58fd2cb6a3a685af9718b4b78feed8 100644 (file)
--- a/test/Makefile.ssl
+++ b/test/Makefile.ssl
@@ -131,13 +131,20 @@ tests:    exe apps $(TESTS)
 apps:
        @(cd ..; $(MAKE) DIRS=apps all)
 
-SET_SO_PATHS=OSSL_LIBPATH="`cd ..; pwd`"; \
-               LD_LIBRARY_PATH="$$OSSL_LIBPATH:$$LD_LIBRARY_PATH"; \
-               DYLD_LIBRARY_PATH="$$OSSL_LIBPATH:$$DYLD_LIBRARY_PATH"; \
-               SHLIB_PATH="$$OSSL_LIBPATH:$$SHLIB_PATH"; \
-               LIBPATH="$$OSSL_LIBPATH:$$LIBPATH"; \
-               if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="$${LIBPATH}:$$PATH"; fi; \
-               export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH
+SET_SO_PATHS=\
+       if [ -n "$(SHARED_LIBS)" ]; then \
+         OSSL_LIBPATH="`cd ..; pwd`"; \
+         LD_LIBRARY_PATH="$$OSSL_LIBPATH:$$LD_LIBRARY_PATH"; \
+         DYLD_LIBRARY_PATH="$$OSSL_LIBPATH:$$DYLD_LIBRARY_PATH"; \
+         SHLIB_PATH="$$OSSL_LIBPATH:$$SHLIB_PATH"; \
+         LIBPATH="$$OSSL_LIBPATH:$$LIBPATH"; \
+         if [ "$(PLATFORM)" = "Cygwin" ]; then \
+           PATH="$${LIBPATH}:$$PATH"; \
+         fi; \
+         LD_PRELOAD="$$OSSL_LIBPATH/libssl.so $$OSSL_LIBPATH/libcrypto.so"; \
+         export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \
+         export LD_PRELOAD; \
+       fi
 
 alltests: \
        test_des test_idea test_sha test_md4 test_md5 test_hmac \