diff options
Diffstat (limited to 'spec/util')
-rw-r--r-- | spec/util/test_env.lua | 9 | ||||
-rw-r--r-- | spec/util/versions.lua | 4 |
2 files changed, 7 insertions, 6 deletions
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) | |||
446 | else | 446 | else |
447 | -- check if already downloaded | 447 | -- check if already downloaded |
448 | if not test_env.exists(save_path .. "/" .. url) then | 448 | if not test_env.exists(save_path .. "/" .. url) then |
449 | table.insert(to_download, luarocks_repo .. url) | 449 | table.insert(to_download, ((luarocks_repo .. url):gsub("org//", "org/"))) |
450 | end | 450 | end |
451 | end | 451 | end |
452 | end | 452 | end |
@@ -972,7 +972,7 @@ local function prepare_mock_server_binary_rocks() | |||
972 | "wsapi-1.6.1-1.src.rock", | 972 | "wsapi-1.6.1-1.src.rock", |
973 | "rings-1.3.0-1.src.rock", | 973 | "rings-1.3.0-1.src.rock", |
974 | "wsapi-xavante-1.6.1-1.src.rock", | 974 | "wsapi-xavante-1.6.1-1.src.rock", |
975 | "dkjson-2.5-2.src.rock", | 975 | "dkjson-${DKJSON}.src.rock", |
976 | "restserver-0.1-1.src.rock", | 976 | "restserver-0.1-1.src.rock", |
977 | "restserver-xavante-0.2-1.src.rock", | 977 | "restserver-xavante-0.2-1.src.rock", |
978 | } | 978 | } |
@@ -1019,9 +1019,8 @@ function test_env.main() | |||
1019 | table.insert(urls, "/luasocket-${LUASOCKET}.src.rock") | 1019 | table.insert(urls, "/luasocket-${LUASOCKET}.src.rock") |
1020 | table.insert(urls, "/luasocket-${LUASOCKET}.rockspec") | 1020 | table.insert(urls, "/luasocket-${LUASOCKET}.rockspec") |
1021 | table.insert(urls, "/md5-1.2-1.src.rock") | 1021 | table.insert(urls, "/md5-1.2-1.src.rock") |
1022 | --table.insert(urls, "/lzlib-0.4.1.53-1.src.rock") | 1022 | table.insert(urls, "/manifests/hisham/lua-zlib-1.2-0.src.rock") |
1023 | table.insert(urls, "/lua-zlib-1.2-0.src.rock") | 1023 | table.insert(urls, "/manifests/hisham/lua-bz2-0.2.1.1-1.src.rock") |
1024 | table.insert(urls, "/lua-bz2-0.1.0-1.src.rock") | ||
1025 | rocks = {"luafilesystem", "luasocket", "md5", "lua-zlib", "lua-bz2"} | 1024 | rocks = {"luafilesystem", "luasocket", "md5", "lua-zlib", "lua-bz2"} |
1026 | if test_env.TEST_TARGET_OS ~= "windows" then | 1025 | if test_env.TEST_TARGET_OS ~= "windows" then |
1027 | if test_env.lua_version == "5.1" then | 1026 | 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 { | |||
2 | binaryheap = "0.4-1", -- dependency for copas | 2 | binaryheap = "0.4-1", -- dependency for copas |
3 | bit32 = "5.3.5.1-1", -- dependency for luaposix on Lua 5.1 | 3 | bit32 = "5.3.5.1-1", -- dependency for luaposix on Lua 5.1 |
4 | cluacov = "0.1.2-1", | 4 | cluacov = "0.1.2-1", |
5 | copas = "3.0.0-1", | 5 | copas = "3.0.0-2", |
6 | cprint = "0.2-1", | ||
7 | dkjson = "2.6-1", | ||
6 | lpeg = "1.0.0-1", | 8 | lpeg = "1.0.0-1", |
7 | luacov = "0.15.0-1", | 9 | luacov = "0.15.0-1", |
8 | luafilesystem = "1.8.0-1", | 10 | luafilesystem = "1.8.0-1", |