diff options
| author | Hisham <hisham@gobolinux.org> | 2016-10-15 10:16:56 -0700 |
|---|---|---|
| committer | Hisham <hisham@gobolinux.org> | 2016-10-15 10:16:56 -0700 |
| commit | bcd4344e557476e00e10796f6f82927904c23c88 (patch) | |
| tree | 51df0526ff3449c4b54aed659988d03f7ef7fb72 /test/test_environment.lua | |
| parent | 1c4779c2f13b1bbc74cfdbb906f6a4225867f74b (diff) | |
| parent | 90a39598f98bb203b3ddeed1c637fe4239046525 (diff) | |
| download | luarocks-bcd4344e557476e00e10796f6f82927904c23c88.tar.gz luarocks-bcd4344e557476e00e10796f6f82927904c23c88.tar.bz2 luarocks-bcd4344e557476e00e10796f6f82927904c23c88.zip | |
Merge branch 'master' of https://github.com/keplerproject/luarocks
Diffstat (limited to 'test/test_environment.lua')
| -rw-r--r-- | test/test_environment.lua | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/test/test_environment.lua b/test/test_environment.lua index 8239795d..87401a90 100644 --- a/test/test_environment.lua +++ b/test/test_environment.lua | |||
| @@ -202,6 +202,9 @@ function test_env.set_args() | |||
| 202 | 202 | ||
| 203 | if execute_bool("sw_vers") then | 203 | if execute_bool("sw_vers") then |
| 204 | test_env.TEST_TARGET_OS = "osx" | 204 | test_env.TEST_TARGET_OS = "osx" |
| 205 | if test_env.TRAVIS then | ||
| 206 | test_env.OPENSSL_DIRS = "OPENSSL_LIBDIR=/usr/local/opt/openssl/lib OPENSSL_INCDIR=/usr/local/opt/openssl/include" | ||
| 207 | end | ||
| 205 | elseif execute_output("uname -s") == "Linux" then | 208 | elseif execute_output("uname -s") == "Linux" then |
| 206 | test_env.TEST_TARGET_OS = "linux" | 209 | test_env.TEST_TARGET_OS = "linux" |
| 207 | else | 210 | else |