From 83b0f6d2343f2631b9dc96c09c2bc4b2cfadd17f Mon Sep 17 00:00:00 2001 From: Hisham Date: Thu, 28 Jul 2016 18:15:35 -0300 Subject: Tweak tests for luarocks-3 branch. --- test/test_environment.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/test_environment.lua') diff --git a/test/test_environment.lua b/test/test_environment.lua index 13e548f9..c26c1e87 100644 --- a/test/test_environment.lua +++ b/test/test_environment.lua @@ -361,7 +361,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/?$", "") @@ -409,7 +409,7 @@ 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.platform = execute_output(test_env.testing_paths.lua .. " -e 'print(require(\"luarocks.core.cfg\").arch)'", 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 From 8db1399ab7e9e9f0d211f81a038af18dfd5eadff Mon Sep 17 00:00:00 2001 From: Hisham Date: Wed, 19 Oct 2016 15:22:50 -0400 Subject: Merge in Windows-compatible quoting. --- test/test_environment.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/test_environment.lua') diff --git a/test/test_environment.lua b/test/test_environment.lua index f813707a..b174020b 100644 --- a/test/test_environment.lua +++ b/test/test_environment.lua @@ -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.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.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 From c5f11204bf774c845fd3b6205e736fcbeaf680c9 Mon Sep 17 00:00:00 2001 From: Hisham Date: Wed, 19 Oct 2016 16:12:46 -0400 Subject: Oops, messed with the module location. --- test/test_environment.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/test_environment.lua') diff --git a/test/test_environment.lua b/test/test_environment.lua index b174020b..93f10b83 100644 --- a/test/test_environment.lua +++ b/test/test_environment.lua @@ -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.md5sums = create_md5sums(test_env.testing_paths) test_env.setup_done = true title("RUNNING TESTS") -- cgit v1.2.3-55-g6feb