Let LuaRocks find LUA_LIBDIR and LUA_INCDIR by itself

2 files changed, 4 insertions, 14 deletions

diff --git a/spec/config_spec.lua b/spec/config_spec.lua
index 825245b7..f415909d 100644
--- a/spec/config_spec.lua
+++ b/spec/config_spec.lua
@@ -20,14 +20,14 @@ describe("LuaRocks config tests #integration", function()
          assert.match("rocks_servers", run.luarocks("config"))
       end)
       
-      it("LuaRocks config include dir", function()
+      it("LuaRocks config include dir returns a subdir of LUA_DIR", function()
          local output = run.luarocks("config --lua-incdir")
-         assert.are.same(hardcoded.LUA_INCDIR, output)
+         assert.match(hardcoded.LUA_DIR, output, 1, true)
       end)
       
-      it("LuaRocks config library dir", function()
+      it("LuaRocks config library dir returns a subdir of LUA_DIR", function()
          local output = run.luarocks("config --lua-libdir")
-         assert.are.same(hardcoded.LUA_LIBDIR, output)
+         assert.match(hardcoded.LUA_DIR, output, 1, true)
       end)
       
       it("LuaRocks config lua version", function()
diff --git a/spec/util/test_env.lua b/spec/util/test_env.lua
index fc292607..60162ee3 100644
--- a/spec/util/test_env.lua
+++ b/spec/util/test_env.lua
@@ -547,14 +547,6 @@ local function create_paths(luaversion_full)
    end
    assert(testing_paths.lua, "Lua interpreter not found! Run `busted -Xhelper help` for options")
 
-   local incfile = test_env.file_if_exists(testing_paths.luadir .. "/include/lua/" .. test_env.lua_version .. "/lua.h")
-                or test_env.file_if_exists(testing_paths.luadir .. "/include/lua" .. test_env.lua_version .. "/lua.h")
-                or test_env.file_if_exists(testing_paths.luadir .. "/include/lua.h")
-   testing_paths.lua_incdir = assert(incfile, "Lua header lua.h not found!"):gsub("/lua.h$", "")
-
-   testing_paths.lua_libdir = test_env.file_if_exists(testing_paths.luadir .. "/lib")
-                           or test_env.file_if_exists(testing_paths.luadir)
-
    local base_dir = lfs.currentdir()
 
    if test_env.TEST_TARGET_OS == "windows" then
@@ -770,8 +762,6 @@ local function setup_luarocks()
       "return {",
       ("SYSCONFDIR = %q,"):format(testing_paths.testing_lrprefix .. "/etc/luarocks"),
       ("LUA_DIR = %q,"):format(testing_paths.luadir),
-      ("LUA_INCDIR = %q,"):format(testing_paths.lua_incdir),
-      ("LUA_LIBDIR = %q,"):format(testing_paths.lua_libdir),
       ("LUA_BINDIR = %q,"):format(testing_paths.lua_bindir),
       ("LUA_INTERPRETER = %q,"):format(testing_paths.lua_interpreter),
    }