Merge branch 'new-cmd-dir'

3 files changed, 48 insertions, 3 deletions

diff --git a/test/test_environment.lua b/test/test_environment.lua
index 196202df..76dee718 100644
--- a/test/test_environment.lua
+++ b/test/test_environment.lua
@@ -452,7 +452,7 @@ local function reset_environment(testing_paths, md5sums)
 end
 
 local function create_paths(luaversion_full)
-   local cfg = require("luarocks.cfg")
+   local cfg = require("luarocks.core.cfg")
 
    local testing_paths = {}
    testing_paths.luadir = cfg.variables.LUA_BINDIR:gsub("/bin/?$", "")
@@ -513,8 +513,8 @@ function test_env.setup_specs(extra_rocks)
       test_env.main()
       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.platform = execute_output(test_env.testing_paths.lua .. " -e \"print(require('luarocks.core.cfg').arch)\"", false, test_env.env_variables)
+      test_env.lib_extension = execute_output(test_env.testing_paths.lua .. " -e \"print(require('luarocks.core.cfg').lib_extension)\"", false, test_env.env_variables)
       test_env.wrapper_extension = test_env.TEST_TARGET_OS == "windows" and ".bat" or ""
       test_env.md5sums = create_md5sums(test_env.testing_paths)
       test_env.setup_done = true
diff --git a/test/testfiles/luajit-fail-1.0-1.rockspec b/test/testfiles/luajit-fail-1.0-1.rockspec
new file mode 100644
index 00000000..f8204600
--- /dev/null
+++ b/test/testfiles/luajit-fail-1.0-1.rockspec
@@ -0,0 +1,22 @@
+package = "luajit-fail"
+version = "1.0-1"
+source = {
+   url = "https://raw.githubusercontent.com/keplerproject/luarocks/master/test/testing.lua",
+}
+description = {
+   summary = "Test luajit dependency fail",
+   detailed = [[
+Fail luajit dependency when running with rockspec_format < 3.0.
+]],
+   homepage = "http://luarocks.org/",
+   license = "MIT/X license"
+}
+dependencies = {
+   "luajit >= 2.0"
+}
+build = {
+   type = "builtin",
+   modules = {
+      testing = "testing.lua"
+   }
+}
diff --git a/test/testfiles/luajit-success-1.0-1.rockspec b/test/testfiles/luajit-success-1.0-1.rockspec
new file mode 100644
index 00000000..31c930c3
--- /dev/null
+++ b/test/testfiles/luajit-success-1.0-1.rockspec
@@ -0,0 +1,23 @@
+rockspec_format = "3.0"
+package = "luajit-success"
+version = "1.0-1"
+source = {
+   url = "https://raw.githubusercontent.com/keplerproject/luarocks/master/test/testing.lua",
+}
+description = {
+   summary = "Test luajit dependency fail",
+   detailed = [[
+Use luajit dependency when running with rockspec_format >= 3.0.
+]],
+   homepage = "http://luarocks.org/",
+   license = "MIT/X license"
+}
+dependencies = {
+   "luajit >= 2.0"
+}
+build = {
+   type = "builtin",
+   modules = {
+      testing = "testing.lua"
+   }
+}