From 365c5a4bb52dead8d9f040d9857da448b194ada9 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Fri, 13 Jul 2018 22:51:33 -0300 Subject: Tests: support running with the default detected OpenSSL locations --- spec/util/test_env.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'spec/util') diff --git a/spec/util/test_env.lua b/spec/util/test_env.lua index db5cd203..d5bd90d3 100644 --- a/spec/util/test_env.lua +++ b/spec/util/test_env.lua @@ -208,8 +208,6 @@ end function test_env.set_args() -- if at least Lua/LuaJIT version argument was found on input start to parse other arguments to env. variables test_env.TYPE_TEST_ENV = "minimal" - test_env.OPENSSL_INCDIR = "" - test_env.OPENSSL_LIBDIR = "" test_env.RESET_ENV = true for _, argument in ipairs(arg) do @@ -277,6 +275,11 @@ function test_env.set_args() test_env.lib_extension = "so" end + test_env.openssl_dirs = "" + if test_env.OPENSSL_INCDIR then + test_env.openssl_dirs = "OPENSSL_INCDIR=" .. test_env.OPENSSL_INCDIR .. " OPENSSL_LIBDIR=" .. test_env.OPENSSL_LIBDIR + end + return true end -- cgit v1.2.3-55-g6feb