diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2017-09-13 12:46:22 -0300 |
---|---|---|
committer | Hisham Muhammad <hisham@gobolinux.org> | 2017-09-13 12:46:22 -0300 |
commit | f1473f71235bb89555dea7041b536144d32bac8c (patch) | |
tree | 5c0b9215801ea1711c7919c1b42085d1b5687075 /test/test_environment.lua | |
parent | 1eb598706f9000361f0059a303c3cf99be5a8ceb (diff) | |
parent | 9c853b1e7ec0f30e0e539fb56d7c81edbe5c8d7d (diff) | |
download | luarocks-f1473f71235bb89555dea7041b536144d32bac8c.tar.gz luarocks-f1473f71235bb89555dea7041b536144d32bac8c.tar.bz2 luarocks-f1473f71235bb89555dea7041b536144d32bac8c.zip |
Merge branch 'luarocks-3'
Diffstat (limited to 'test/test_environment.lua')
-rw-r--r-- | test/test_environment.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/test_environment.lua b/test/test_environment.lua index bc1e5277..6b160140 100644 --- a/test/test_environment.lua +++ b/test/test_environment.lua | |||
@@ -452,7 +452,7 @@ local function reset_environment(testing_paths, md5sums) | |||
452 | end | 452 | end |
453 | 453 | ||
454 | local function create_paths(luaversion_full) | 454 | local function create_paths(luaversion_full) |
455 | local cfg = require("luarocks.cfg") | 455 | local cfg = require("luarocks.core.cfg") |
456 | 456 | ||
457 | local testing_paths = {} | 457 | local testing_paths = {} |
458 | testing_paths.luadir = cfg.variables.LUA_BINDIR:gsub("/bin/?$", "") | 458 | testing_paths.luadir = cfg.variables.LUA_BINDIR:gsub("/bin/?$", "") |
@@ -513,8 +513,8 @@ function test_env.setup_specs(extra_rocks) | |||
513 | test_env.main() | 513 | test_env.main() |
514 | package.path = test_env.env_variables.LUA_PATH | 514 | package.path = test_env.env_variables.LUA_PATH |
515 | 515 | ||
516 | test_env.platform = execute_output(test_env.testing_paths.lua .. " -e \"print(require('luarocks.cfg').arch)\"", false, test_env.env_variables) | 516 | test_env.platform = execute_output(test_env.testing_paths.lua .. " -e \"print(require('luarocks.core.cfg').arch)\"", false, test_env.env_variables) |
517 | test_env.lib_extension = execute_output(test_env.testing_paths.lua .. " -e \"print(require('luarocks.cfg').lib_extension)\"", false, test_env.env_variables) | 517 | test_env.lib_extension = execute_output(test_env.testing_paths.lua .. " -e \"print(require('luarocks.core.cfg').lib_extension)\"", false, test_env.env_variables) |
518 | test_env.wrapper_extension = test_env.TEST_TARGET_OS == "windows" and ".bat" or "" | 518 | test_env.wrapper_extension = test_env.TEST_TARGET_OS == "windows" and ".bat" or "" |
519 | test_env.md5sums = create_md5sums(test_env.testing_paths) | 519 | test_env.md5sums = create_md5sums(test_env.testing_paths) |
520 | test_env.setup_done = true | 520 | test_env.setup_done = true |