diff options
| author | Hisham <hisham@gobolinux.org> | 2016-10-15 10:19:34 -0700 |
|---|---|---|
| committer | Hisham <hisham@gobolinux.org> | 2016-10-15 10:19:34 -0700 |
| commit | 6f928845e8d167cf4caf4828a79069d9b71cffd8 (patch) | |
| tree | 98fabdaaf9f7ac6f6f0a5938c8b9a2d5d52a87fa /test | |
| parent | a47f54bb139aa3b932d807e89a0691dfdfaa9723 (diff) | |
| parent | bcd4344e557476e00e10796f6f82927904c23c88 (diff) | |
| download | luarocks-6f928845e8d167cf4caf4828a79069d9b71cffd8.tar.gz luarocks-6f928845e8d167cf4caf4828a79069d9b71cffd8.tar.bz2 luarocks-6f928845e8d167cf4caf4828a79069d9b71cffd8.zip | |
Merge branch 'master' into luarocks-3
Diffstat (limited to 'test')
| -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 799e13ec..f04c22b8 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 |