aboutsummaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorHisham Muhammad <hisham@gobolinux.org>2022-08-25 16:19:56 -0300
committerHisham Muhammad <hisham@gobolinux.org>2022-08-26 17:00:57 -0300
commit3892b1a9a16ca0edd3de92719cd81bd4fcc63ad4 (patch)
treea5815efb3c36b853b3b55e30d94a0e79d901a220 /spec
parent1275f1d78653c2286e8b1a614d07e3149277383c (diff)
downloadluarocks-3892b1a9a16ca0edd3de92719cd81bd4fcc63ad4.tar.gz
luarocks-3892b1a9a16ca0edd3de92719cd81bd4fcc63ad4.tar.bz2
luarocks-3892b1a9a16ca0edd3de92719cd81bd4fcc63ad4.zip
tests: run full tests with LuaSec
Diffstat (limited to 'spec')
-rw-r--r--spec/util/test_env.lua13
-rw-r--r--spec/util/versions.lua1
2 files changed, 9 insertions, 5 deletions
diff --git a/spec/util/test_env.lua b/spec/util/test_env.lua
index 1d67d30d..44021147 100644
--- a/spec/util/test_env.lua
+++ b/spec/util/test_env.lua
@@ -1019,14 +1019,19 @@ function test_env.main()
1019 local rocks = {} -- names of rocks, required for building environment 1019 local rocks = {} -- names of rocks, required for building environment
1020 local urls = {} -- names of rock and rockspec files to be downloaded 1020 local urls = {} -- names of rock and rockspec files to be downloaded
1021 1021
1022 local env_vars = {
1023 LUAROCKS_CONFIG = test_env.testing_paths.testrun_dir .. "/testing_config.lua"
1024 }
1025
1022 if test_env.TYPE_TEST_ENV == "full" then 1026 if test_env.TYPE_TEST_ENV == "full" then
1023 table.insert(urls, "/luafilesystem-${LUAFILESYSTEM}.src.rock") 1027 table.insert(urls, "/luafilesystem-${LUAFILESYSTEM}.src.rock")
1024 table.insert(urls, "/luasocket-${LUASOCKET}.src.rock") 1028 table.insert(urls, "/luasocket-${LUASOCKET}.src.rock")
1025 table.insert(urls, "/luasocket-${LUASOCKET}.rockspec") 1029 table.insert(urls, "/luasocket-${LUASOCKET}.rockspec")
1030 table.insert(urls, "/luasec-${LUASEC}.src.rock")
1026 table.insert(urls, "/md5-1.2-1.src.rock") 1031 table.insert(urls, "/md5-1.2-1.src.rock")
1027 table.insert(urls, "/manifests/hisham/lua-zlib-1.2-0.src.rock") 1032 table.insert(urls, "/manifests/hisham/lua-zlib-1.2-0.src.rock")
1028 table.insert(urls, "/manifests/hisham/lua-bz2-0.2.1.1-1.src.rock") 1033 table.insert(urls, "/manifests/hisham/lua-bz2-0.2.1.1-1.src.rock")
1029 rocks = {"luafilesystem", "luasocket", "md5", "lua-zlib", "lua-bz2"} 1034 rocks = {"luafilesystem", "luasocket", "luasec", "md5", "lua-zlib", "lua-bz2"}
1030 if test_env.TEST_TARGET_OS ~= "windows" then 1035 if test_env.TEST_TARGET_OS ~= "windows" then
1031 if test_env.lua_version == "5.1" then 1036 if test_env.lua_version == "5.1" then
1032 table.insert(urls, "/bit32-${BIT32}.src.rock") 1037 table.insert(urls, "/bit32-${BIT32}.src.rock")
@@ -1035,6 +1040,8 @@ function test_env.main()
1035 table.insert(urls, "/luaposix-${LUAPOSIX}.src.rock") 1040 table.insert(urls, "/luaposix-${LUAPOSIX}.src.rock")
1036 table.insert(rocks, "luaposix") 1041 table.insert(rocks, "luaposix")
1037 end 1042 end
1043 assert(test_env.run.luarocks_nocov("config variables.OPENSSL_INCDIR " .. Q(test_env.OPENSSL_INCDIR), env_vars))
1044 assert(test_env.run.luarocks_nocov("config variables.OPENSSL_LIBDIR " .. Q(test_env.OPENSSL_LIBDIR), env_vars))
1038 end 1045 end
1039 1046
1040 -- luacov is needed for both minimal or full environment 1047 -- luacov is needed for both minimal or full environment
@@ -1049,10 +1056,6 @@ function test_env.main()
1049 lfs.mkdir(testing_paths.testing_server) 1056 lfs.mkdir(testing_paths.testing_server)
1050 download_rocks(urls, testing_paths.testing_server) 1057 download_rocks(urls, testing_paths.testing_server)
1051 1058
1052 local env_vars = {
1053 LUAROCKS_CONFIG = test_env.testing_paths.testrun_dir .. "/testing_config.lua"
1054 }
1055
1056 build_environment(rocks, env_vars) 1059 build_environment(rocks, env_vars)
1057 1060
1058 prepare_mock_server_binary_rocks() 1061 prepare_mock_server_binary_rocks()
diff --git a/spec/util/versions.lua b/spec/util/versions.lua
index 0d3b8796..1b227e4b 100644
--- a/spec/util/versions.lua
+++ b/spec/util/versions.lua
@@ -11,6 +11,7 @@ return {
11 luafilesystem_old = "1.6.3-2", 11 luafilesystem_old = "1.6.3-2",
12 luaposix = "35.1-1", 12 luaposix = "35.1-1",
13 luasocket = "3.0.0-1", 13 luasocket = "3.0.0-1",
14 luasec = "1.2.0-1",
14 lxsh = "0.8.6-2", 15 lxsh = "0.8.6-2",
15 timerwheel = "0.2.0-2", -- dependency for copas 16 timerwheel = "0.2.0-2", -- dependency for copas
16} 17}