From 0f82063a51cd9197edd214e0427fe4e84ae9c0b9 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Sat, 16 Apr 2022 18:53:07 -0300 Subject: tests: run tests on Lua 5.4 and LuaJIT 2.1 --- spec/util/test_env.lua | 9 ++++----- spec/util/versions.lua | 4 +++- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'spec/util') diff --git a/spec/util/test_env.lua b/spec/util/test_env.lua index 6a466bae..c32e9978 100644 --- a/spec/util/test_env.lua +++ b/spec/util/test_env.lua @@ -446,7 +446,7 @@ local function download_rocks(urls, save_path) else -- check if already downloaded if not test_env.exists(save_path .. "/" .. url) then - table.insert(to_download, luarocks_repo .. url) + table.insert(to_download, ((luarocks_repo .. url):gsub("org//", "org/"))) end end end @@ -972,7 +972,7 @@ local function prepare_mock_server_binary_rocks() "wsapi-1.6.1-1.src.rock", "rings-1.3.0-1.src.rock", "wsapi-xavante-1.6.1-1.src.rock", - "dkjson-2.5-2.src.rock", + "dkjson-${DKJSON}.src.rock", "restserver-0.1-1.src.rock", "restserver-xavante-0.2-1.src.rock", } @@ -1019,9 +1019,8 @@ function test_env.main() table.insert(urls, "/luasocket-${LUASOCKET}.src.rock") table.insert(urls, "/luasocket-${LUASOCKET}.rockspec") table.insert(urls, "/md5-1.2-1.src.rock") - --table.insert(urls, "/lzlib-0.4.1.53-1.src.rock") - table.insert(urls, "/lua-zlib-1.2-0.src.rock") - table.insert(urls, "/lua-bz2-0.1.0-1.src.rock") + table.insert(urls, "/manifests/hisham/lua-zlib-1.2-0.src.rock") + table.insert(urls, "/manifests/hisham/lua-bz2-0.2.1.1-1.src.rock") rocks = {"luafilesystem", "luasocket", "md5", "lua-zlib", "lua-bz2"} if test_env.TEST_TARGET_OS ~= "windows" then if test_env.lua_version == "5.1" then diff --git a/spec/util/versions.lua b/spec/util/versions.lua index b0d5c453..0d3b8796 100644 --- a/spec/util/versions.lua +++ b/spec/util/versions.lua @@ -2,7 +2,9 @@ return { binaryheap = "0.4-1", -- dependency for copas bit32 = "5.3.5.1-1", -- dependency for luaposix on Lua 5.1 cluacov = "0.1.2-1", - copas = "3.0.0-1", + copas = "3.0.0-2", + cprint = "0.2-1", + dkjson = "2.6-1", lpeg = "1.0.0-1", luacov = "0.15.0-1", luafilesystem = "1.8.0-1", -- cgit v1.2.3-55-g6feb