From 744df0e5bf1ed712478c3df6aa28901f38d7189f Mon Sep 17 00:00:00 2001
From: Hisham Muhammad <hisham@gobolinux.org>
Date: Wed, 20 Jun 2018 14:18:00 -0300
Subject: Tests: ensure that tests do not accidentally find a project dir
---
spec/util/test_env.lua | 1 +
src/luarocks/cmd.lua | 2 ++
2 files changed, 3 insertions(+)
diff --git a/spec/util/test_env.lua b/spec/util/test_env.lua
index 1d4e98d8..269a1cfc 100644
--- a/spec/util/test_env.lua
+++ b/spec/util/test_env.lua
@@ -839,6 +839,7 @@ function test_env.main()
end
lfs.mkdir(testing_paths.testrun_dir)
+ test_env.write_file(testing_paths.testrun_dir .. "/.luarocks-no-project", "")
lfs.mkdir(testing_paths.testing_cache)
lfs.mkdir(testing_paths.luarocks_tmp)
diff --git a/src/luarocks/cmd.lua b/src/luarocks/cmd.lua
index 70d93670..6ce9a8b5 100644
--- a/src/luarocks/cmd.lua
+++ b/src/luarocks/cmd.lua
@@ -175,6 +175,8 @@ do
if fs.is_dir(abs .. "/.luarocks") and fs.is_dir(abs .. "/lua_modules") then
abs = abs:gsub("/.$", "")
return abs, abs .. "/lua_modules"
+ elseif fs.exists(abs .. "/.luarocks-no-project") then
+ return nil
end
try = try .. "/.."
end
--
cgit v1.2.3-55-g6feb