From 67a8c5c13f057163273c15dea73491a86f61c676 Mon Sep 17 00:00:00 2001 From: George Roman Date: Wed, 4 Jul 2018 00:44:00 +0300 Subject: Tests: separate OPENSSL_DIRS into OPENSSL_INCDIR and OPENSSL_LIBDIR --- spec/build_spec.lua | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'spec/build_spec.lua') diff --git a/spec/build_spec.lua b/spec/build_spec.lua index 74efccd5..c7fd2a22 100644 --- a/spec/build_spec.lua +++ b/spec/build_spec.lua @@ -161,7 +161,8 @@ describe("LuaRocks build tests #integration", function() end) it("LuaRocks build luasec with skipping dependency checks", function() - assert.is_true(run.luarocks_bool("build luasec 0.6-1 " .. test_env.OPENSSL_DIRS .. " --nodeps")) + local openssl_dirs = "OPENSSL_INCDIR=" .. test_env.OPENSSL_INCDIR .. " OPENSSL_LIBDIR=" .. test_env.OPENSSL_LIBDIR + assert.is_true(run.luarocks_bool("build luasec 0.6-1 " .. openssl_dirs .. " --nodeps")) assert.is.truthy(lfs.attributes(testing_paths.testing_sys_rocks .. "/luasec/0.6-1/luasec-0.6-1.rockspec")) end) @@ -221,7 +222,8 @@ describe("LuaRocks build tests #integration", function() end it("LuaRocks build luasec only deps", function() - assert.is_true(run.luarocks_bool("build luasec " .. test_env.OPENSSL_DIRS .. " --only-deps")) + local openssl_dirs = "OPENSSL_INCDIR=" .. test_env.OPENSSL_INCDIR .. " OPENSSL_LIBDIR=" .. test_env.OPENSSL_LIBDIR + assert.is_true(run.luarocks_bool("build luasec " .. openssl_dirs .. " --only-deps")) assert.is_false(run.luarocks_bool("show luasec")) assert.is.falsy(lfs.attributes(testing_paths.testing_sys_rocks .. "/luasec/0.6-1/luasec-0.6-1.rockspec")) end) @@ -255,8 +257,9 @@ describe("LuaRocks build tests #integration", function() end) it("LuaRocks build with https", function() + local openssl_dirs = "OPENSSL_INCDIR=" .. test_env.OPENSSL_INCDIR .. " OPENSSL_LIBDIR=" .. test_env.OPENSSL_LIBDIR assert.is_true(run.luarocks_bool("download --rockspec validate-args 1.5.4-1")) - assert.is_true(run.luarocks_bool("install luasec " .. test_env.OPENSSL_DIRS)) + assert.is_true(run.luarocks_bool("install luasec " .. openssl_dirs)) assert.is_true(run.luarocks_bool("build validate-args-1.5.4-1.rockspec")) assert.is.truthy(run.luarocks("show validate-args")) -- cgit v1.2.3-55-g6feb