diff options
| author | Richard Levitte <levitte@openssl.org> | 2004-11-11 19:18:43 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2004-11-11 19:18:43 +0100 |
| commit | 69c922f5d27ea1fef4f67ed8b143540b0e33c364 (patch) | |
| tree | c1d34157e6d1f84bbb18ab496d70e31c9af4cf16 /test | |
| parent | Use the default_md config file value when signing CRLs. (diff) | |
| download | openssl-69c922f5d27ea1fef4f67ed8b143540b0e33c364.tar.xz openssl-69c922f5d27ea1fef4f67ed8b143540b0e33c364.zip | |
Some find it confusing that environment variables are set when shared
libraries aren't built or used. I can see the point, so I'm
reorganising a little for clarity.
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.ssl | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/test/Makefile.ssl b/test/Makefile.ssl index 09110f3caa..f3a7b58f4c 100644 --- a/test/Makefile.ssl +++ b/test/Makefile.ssl @@ -131,17 +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; \ - if [ -n "$(SHARED_LIBS)" ]; then \ - LD_PRELOAD="$$OSSL_LIBPATH/libssl.so $$OSSL_LIBPATH/libcrypto.so"; \ - export LD_PRELOAD; \ - fi +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 \ |