From 957149e4be48fe3f87b44f73984c5b20fd8d08f1 Mon Sep 17 00:00:00 2001 From: Peter Melnichenko Date: Mon, 11 Sep 2017 13:14:02 +0300 Subject: Use dkjson instead of lua-cjson for upload test lua-cjson fails to build under LuaJIT 2.1.0-beta3. --- spec/upload_spec.lua | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'spec') diff --git a/spec/upload_spec.lua b/spec/upload_spec.lua index cd175730..8b3e0433 100644 --- a/spec/upload_spec.lua +++ b/spec/upload_spec.lua @@ -5,8 +5,6 @@ local testing_paths = test_env.testing_paths test_env.unload_luarocks() local extra_rocks = { - "/lua-cjson-2.1.0-1.src.rock", - -- rocks needed for mock-server "/copas-2.0.1-1.src.rock", "/coxpcall-1.16.0-1.src.rock", @@ -46,9 +44,8 @@ describe("LuaRocks upload tests #blackbox #b_upload", function() end) it("LuaRocks upload force #unix", function() - assert.is_true(run.luarocks_bool("install lua-cjson")) + assert.is_true(test_env.need_rock("dkjson")) assert.is_false(run.luarocks_bool("upload --api-key=\"invalid\" --force " .. testing_paths.testing_server .. "/luasocket-3.0rc1-2.rockspec")) - assert.is_true(run.luarocks_bool("install lua-cjson")) end) describe("LuaRocks upload tests with Xavante server #mock", function() -- cgit v1.2.3-55-g6feb