diff options
| author | roboo <robo.karasek@gmail.com> | 2016-08-21 22:46:19 +0200 |
|---|---|---|
| committer | roboo <robo.karasek@gmail.com> | 2016-08-21 22:46:19 +0200 |
| commit | beaecdbccb9fa244bbc0253aedd26d372aa312aa (patch) | |
| tree | df0c936b7d7f75c74bc292379f63cc2d6e8144ac | |
| parent | cb212b167b120490d872cc9e1b8548a0770dd4c4 (diff) | |
| download | luarocks-beaecdbccb9fa244bbc0253aedd26d372aa312aa.tar.gz luarocks-beaecdbccb9fa244bbc0253aedd26d372aa312aa.tar.bz2 luarocks-beaecdbccb9fa244bbc0253aedd26d372aa312aa.zip | |
Fix of test_environment
| -rw-r--r-- | test/test_environment.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/test_environment.lua b/test/test_environment.lua index 42473b38..1c31462c 100644 --- a/test/test_environment.lua +++ b/test/test_environment.lua | |||
| @@ -181,7 +181,7 @@ function test_env.set_args() | |||
| 181 | 181 | ||
| 182 | if execute_bool("sw_vers") then | 182 | if execute_bool("sw_vers") then |
| 183 | test_env.TEST_TARGET_OS = "osx" | 183 | test_env.TEST_TARGET_OS = "osx" |
| 184 | elseif execute_bool("uname -s") then | 184 | elseif execute_output("uname -s") == "Linux" then |
| 185 | test_env.TEST_TARGET_OS = "linux" | 185 | test_env.TEST_TARGET_OS = "linux" |
| 186 | else | 186 | else |
| 187 | test_env.TEST_TARGET_OS = "windows" | 187 | test_env.TEST_TARGET_OS = "windows" |
| @@ -321,7 +321,7 @@ local function create_env(testing_paths) | |||
| 321 | env_variables.LUA_PATH = env_variables.LUA_PATH .. testing_paths.src_dir .. "/?.lua;" | 321 | env_variables.LUA_PATH = env_variables.LUA_PATH .. testing_paths.src_dir .. "/?.lua;" |
| 322 | env_variables.LUA_CPATH = testing_paths.testing_tree .. "/lib/lua/" .. luaversion_short .. "/?.so;" | 322 | env_variables.LUA_CPATH = testing_paths.testing_tree .. "/lib/lua/" .. luaversion_short .. "/?.so;" |
| 323 | .. testing_paths.testing_sys_tree .. "/lib/lua/" .. luaversion_short .. "/?.so;" | 323 | .. testing_paths.testing_sys_tree .. "/lib/lua/" .. luaversion_short .. "/?.so;" |
| 324 | env_variables.PATH = os.getenv("PATH") .. ":" .. testing_paths.testing_tree .. "/bin:" .. testing_paths.testing_sys_tree .. "/bin" | 324 | env_variables.PATH = os.getenv("PATH") .. ";" .. testing_paths.testing_tree .. "/bin;" .. testing_paths.testing_sys_tree .. "/bin;" |
| 325 | 325 | ||
| 326 | return env_variables | 326 | return env_variables |
| 327 | end | 327 | end |