From 2f67a04c91c5088d78d5f18013dded4f89382ff3 Mon Sep 17 00:00:00 2001 From: Hisham Date: Tue, 18 Oct 2016 17:59:19 -0400 Subject: Test case for issue #268 --- spec/install_spec.lua | 15 ++++++++++++++- test/test_environment.lua | 1 + 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/spec/install_spec.lua b/spec/install_spec.lua index 8857e4bd..45b3e2f9 100644 --- a/spec/install_spec.lua +++ b/spec/install_spec.lua @@ -18,7 +18,9 @@ local extra_rocks = { "/lxsh-0.8.6-2.rockspec", "/say-1.2-1.src.rock", "/say-1.0-1.src.rock", - "/wsapi-1.6-1.src.rock" + "/wsapi-1.6-1.src.rock", + "/luafilesystem-1.6.3-2.src.rock", + "/luafilesystem-1.6.1-1.src.rock", } describe("LuaRocks install tests #blackbox #b_install", function() @@ -81,6 +83,17 @@ describe("LuaRocks install tests #blackbox #b_install", function() end assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/luasec")) end) + + it('LuaRocks install - handle versioned modules when installing another version with --keep #268', function() + assert.is_true(run.luarocks_bool("install luafilesystem")) + assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/lua/"..env_variables.LUA_VERSION.."/lfs."..test_env.lib_extension)) + assert.is_true(run.luarocks_bool("install luafilesystem 1.6.1 --keep")) + assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/lua/"..env_variables.LUA_VERSION.."/lfs."..test_env.lib_extension)) + assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/lua/"..env_variables.LUA_VERSION.."/luafilesystem_1_6_1_1-lfs."..test_env.lib_extension)) + assert.is_true(run.luarocks_bool("install luafilesystem")) + assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/lua/"..env_variables.LUA_VERSION.."/lfs."..test_env.lib_extension)) + assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/lua/"..env_variables.LUA_VERSION.."/luafilesystem_1_6_1_1-lfs."..test_env.lib_extension)) + end) it("LuaRocks install only-deps of luasocket packed rock", function() assert.is_true(run.luarocks_bool("build --pack-binary-rock luasocket 3.0rc1-2")) diff --git a/test/test_environment.lua b/test/test_environment.lua index 87401a90..1d0b0c32 100644 --- a/test/test_environment.lua +++ b/test/test_environment.lua @@ -514,6 +514,7 @@ function test_env.setup_specs(extra_rocks) package.path = test_env.env_variables.LUA_PATH test_env.platform = execute_output(test_env.testing_paths.lua .. " -e \"print(require('luarocks.cfg').arch)\"", false, test_env.env_variables) + test_env.lib_extension = execute_output(test_env.testing_paths.lua .. " -e \"print(require('luarocks.cfg').lib_extension)\"", false, test_env.env_variables) test_env.md5sums = create_md5sums(test_env.testing_paths) test_env.setup_done = true title("RUNNING TESTS") -- cgit v1.2.3-55-g6feb