diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2018-03-29 14:12:02 -0300 |
---|---|---|
committer | Hisham Muhammad <hisham@gobolinux.org> | 2018-03-29 14:12:02 -0300 |
commit | 4ba86ca6233840f1d3672afc9540d62313ad235c (patch) | |
tree | e4e7ba5ee41eaead5c4dcd2e3502cace963cb41d /spec | |
parent | 395e53545ba7ad4018467cdf318da2a13cb17441 (diff) | |
download | luarocks-4ba86ca6233840f1d3672afc9540d62313ad235c.tar.gz luarocks-4ba86ca6233840f1d3672afc9540d62313ad235c.tar.bz2 luarocks-4ba86ca6233840f1d3672afc9540d62313ad235c.zip |
Tests: isolate test environment from existing Lua variables
Diffstat (limited to 'spec')
-rw-r--r-- | spec/util/test_env.lua | 17 |
1 files changed, 16 insertions, 1 deletions
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) | |||
98 | if print_command then | 98 | if print_command then |
99 | print("[EXECUTING]: " .. command) | 99 | print("[EXECUTING]: " .. command) |
100 | end | 100 | end |
101 | |||
102 | local unset_variables = { | ||
103 | "LUA_PATH", | ||
104 | "LUA_CPATH", | ||
105 | "LUA_PATH_5_2", | ||
106 | "LUA_CPATH_5_2", | ||
107 | "LUA_PATH_5_3", | ||
108 | "LUA_CPATH_5_3", | ||
109 | } | ||
101 | 110 | ||
102 | if env_variables then | 111 | if env_variables then |
103 | if test_env.TEST_TARGET_OS == "windows" then | 112 | if test_env.TEST_TARGET_OS == "windows" then |
113 | for _, k in ipairs(unset_variables) do | ||
114 | final_command = final_command .. "set " .. k .. "=&" | ||
115 | end | ||
104 | for k,v in pairs(env_variables) do | 116 | for k,v in pairs(env_variables) do |
105 | final_command = final_command .. "set " .. k .. "=" .. v .. "&" | 117 | final_command = final_command .. "set " .. k .. "=" .. v .. "&" |
106 | end | 118 | end |
107 | final_command = final_command:sub(1, -2) .. "&" | 119 | final_command = final_command:sub(1, -2) .. "&" |
108 | else | 120 | else |
109 | final_command = "export " | 121 | for _, k in ipairs(unset_variables) do |
122 | final_command = final_command .. "unset " .. k .. "; " | ||
123 | end | ||
124 | final_command = final_command .. "export " | ||
110 | for k,v in pairs(env_variables) do | 125 | for k,v in pairs(env_variables) do |
111 | final_command = final_command .. k .. "='" .. v .. "' " | 126 | final_command = final_command .. k .. "='" .. v .. "' " |
112 | end | 127 | end |