From 4ba86ca6233840f1d3672afc9540d62313ad235c Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Thu, 29 Mar 2018 14:12:02 -0300 Subject: Tests: isolate test environment from existing Lua variables --- spec/util/test_env.lua | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/spec/util/test_env.lua b/spec/util/test_env.lua index c5178e57..ce2b1728 100644 --- a/spec/util/test_env.lua +++ b/spec/util/test_env.lua @@ -98,15 +98,30 @@ function test_env.execute_helper(command, print_command, env_variables) if print_command then print("[EXECUTING]: " .. command) end + + local unset_variables = { + "LUA_PATH", + "LUA_CPATH", + "LUA_PATH_5_2", + "LUA_CPATH_5_2", + "LUA_PATH_5_3", + "LUA_CPATH_5_3", + } if env_variables then if test_env.TEST_TARGET_OS == "windows" then + for _, k in ipairs(unset_variables) do + final_command = final_command .. "set " .. k .. "=&" + end for k,v in pairs(env_variables) do final_command = final_command .. "set " .. k .. "=" .. v .. "&" end final_command = final_command:sub(1, -2) .. "&" else - final_command = "export " + for _, k in ipairs(unset_variables) do + final_command = final_command .. "unset " .. k .. "; " + end + final_command = final_command .. "export " for k,v in pairs(env_variables) do final_command = final_command .. k .. "='" .. v .. "' " end -- cgit v1.2.3-55-g6feb