diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2018-06-20 14:22:22 -0300 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2018-07-01 15:51:13 -0300 |
| commit | 73bb24caafa90b03744451590eebf24d357f9a2e (patch) | |
| tree | 092fe40c98b09fe4a4bdbcbc184f013af44fac48 /spec/util | |
| parent | b51e98582dd8b59a15bd0dcbf469c05d01c3e045 (diff) | |
| download | luarocks-73bb24caafa90b03744451590eebf24d357f9a2e.tar.gz luarocks-73bb24caafa90b03744451590eebf24d357f9a2e.tar.bz2 luarocks-73bb24caafa90b03744451590eebf24d357f9a2e.zip | |
cmd, Tests: ensure versioned directory is tried first
Diffstat (limited to 'spec/util')
| -rw-r--r-- | spec/util/test_env.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/util/test_env.lua b/spec/util/test_env.lua index 269a1cfc..ed97973a 100644 --- a/spec/util/test_env.lua +++ b/spec/util/test_env.lua | |||
| @@ -744,9 +744,9 @@ local function install_luarocks(install_env_vars) | |||
| 744 | assert(execute_bool("install.bat /LUA " .. testing_paths.luadir .. " " .. compiler_flag .. " /P " .. testing_paths.testing_lrprefix .. " /NOREG /NOADMIN /F /Q /CONFIG " .. testing_paths.testing_lrprefix .. "/etc/luarocks", false, install_env_vars)) | 744 | assert(execute_bool("install.bat /LUA " .. testing_paths.luadir .. " " .. compiler_flag .. " /P " .. testing_paths.testing_lrprefix .. " /NOREG /NOADMIN /F /Q /CONFIG " .. testing_paths.testing_lrprefix .. "/etc/luarocks", false, install_env_vars)) |
| 745 | assert(execute_bool(testing_paths.win_tools .. "/cp " .. testing_paths.testing_lrprefix .. "/lua/luarocks/core/site_config* " .. testing_paths.src_dir .. "/luarocks/core")) | 745 | assert(execute_bool(testing_paths.win_tools .. "/cp " .. testing_paths.testing_lrprefix .. "/lua/luarocks/core/site_config* " .. testing_paths.src_dir .. "/luarocks/core")) |
| 746 | else | 746 | else |
| 747 | local incfile = test_env.file_if_exists(testing_paths.luadir .. "/include/lua.h") | 747 | local incfile = test_env.file_if_exists(testing_paths.luadir .. "/include/lua/" .. test_env.lua_version .. "/lua.h") |
| 748 | or test_env.file_if_exists(testing_paths.luadir .. "/include/lua/" .. test_env.lua_version .. "/lua.h") | ||
| 749 | or test_env.file_if_exists(testing_paths.luadir .. "/include/lua" .. test_env.lua_version .. "/lua.h") | 748 | or test_env.file_if_exists(testing_paths.luadir .. "/include/lua" .. test_env.lua_version .. "/lua.h") |
| 749 | or test_env.file_if_exists(testing_paths.luadir .. "/include/lua.h") | ||
| 750 | local incdir = assert(incfile):gsub("/lua.h$", "") | 750 | local incdir = assert(incfile):gsub("/lua.h$", "") |
| 751 | 751 | ||
| 752 | local lines = { | 752 | local lines = { |