Merge remote-tracking branch 'origin/refs/pull/1844/head'

2 files changed, 6 insertions, 2 deletions

diff --git a/spec/init_spec.lua b/spec/init_spec.lua
index 88bd23a5..6cc0dd90 100644
--- a/spec/init_spec.lua
+++ b/spec/init_spec.lua
@@ -153,13 +153,13 @@ describe("luarocks init #integration", function()
          lfs.mkdir(myproject)
          lfs.chdir(myproject)
 
-         assert(run.luarocks("init --lua-versions=5.1,5.2,5.3,5.4"))
+         assert(run.luarocks("init --lua-versions=5.1,5.2,5.3,5.4,5.5"))
          local rockspec_name = myproject .. "/myproject-dev-1.rockspec"
          assert.truthy(lfs.attributes(rockspec_name))
          local fd = assert(io.open(rockspec_name, "rb"))
          local data = fd:read("*a")
          fd:close()
-         assert.truthy(data:find("lua >= 5.1, < 5.5", 1, true))
+         assert.truthy(data:find("lua >= 5.1, < 5.6", 1, true))
       end, finally)
    end)
 
diff --git a/spec/util/test_env.lua b/spec/util/test_env.lua
index 390ba01c..4b359b7f 100644
--- a/spec/util/test_env.lua
+++ b/spec/util/test_env.lua
@@ -250,6 +250,10 @@ function test_env.execute_helper(command, print_command, env_variables)
       "LUA_CPATH_5_2",
       "LUA_PATH_5_3",
       "LUA_CPATH_5_3",
+      "LUA_PATH_5_4",
+      "LUA_CPATH_5_4",
+      "LUA_PATH_5_5",
+      "LUA_CPATH_5_5",
       "LUAROCKS_SYSCONFDIR",
    }