diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2018-07-13 22:51:33 -0300 |
---|---|---|
committer | Hisham Muhammad <hisham@gobolinux.org> | 2018-07-18 11:24:07 -0300 |
commit | 365c5a4bb52dead8d9f040d9857da448b194ada9 (patch) | |
tree | 01855228e5577ba39ef876dfa4614e4be972bc56 /spec/util | |
parent | 491bf90358162dec2b4ca0a03d6fa98552968ddc (diff) | |
download | luarocks-365c5a4bb52dead8d9f040d9857da448b194ada9.tar.gz luarocks-365c5a4bb52dead8d9f040d9857da448b194ada9.tar.bz2 luarocks-365c5a4bb52dead8d9f040d9857da448b194ada9.zip |
Tests: support running with the default detected OpenSSL locations
Diffstat (limited to 'spec/util')
-rw-r--r-- | spec/util/test_env.lua | 7 |
1 files changed, 5 insertions, 2 deletions
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 | |||
208 | function test_env.set_args() | 208 | function test_env.set_args() |
209 | -- if at least Lua/LuaJIT version argument was found on input start to parse other arguments to env. variables | 209 | -- if at least Lua/LuaJIT version argument was found on input start to parse other arguments to env. variables |
210 | test_env.TYPE_TEST_ENV = "minimal" | 210 | test_env.TYPE_TEST_ENV = "minimal" |
211 | test_env.OPENSSL_INCDIR = "" | ||
212 | test_env.OPENSSL_LIBDIR = "" | ||
213 | test_env.RESET_ENV = true | 211 | test_env.RESET_ENV = true |
214 | 212 | ||
215 | for _, argument in ipairs(arg) do | 213 | for _, argument in ipairs(arg) do |
@@ -277,6 +275,11 @@ function test_env.set_args() | |||
277 | test_env.lib_extension = "so" | 275 | test_env.lib_extension = "so" |
278 | end | 276 | end |
279 | 277 | ||
278 | test_env.openssl_dirs = "" | ||
279 | if test_env.OPENSSL_INCDIR then | ||
280 | test_env.openssl_dirs = "OPENSSL_INCDIR=" .. test_env.OPENSSL_INCDIR .. " OPENSSL_LIBDIR=" .. test_env.OPENSSL_LIBDIR | ||
281 | end | ||
282 | |||
280 | return true | 283 | return true |
281 | end | 284 | end |
282 | 285 | ||