diff options
Diffstat (limited to 'spec/util')
-rw-r--r-- | spec/util/test_env.lua | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/spec/util/test_env.lua b/spec/util/test_env.lua index c40921cc..737d90a5 100644 --- a/spec/util/test_env.lua +++ b/spec/util/test_env.lua | |||
@@ -17,7 +17,7 @@ ARGUMENTS | |||
17 | default: "minimal"). | 17 | default: "minimal"). |
18 | noreset Don't reset environment after each test | 18 | noreset Don't reset environment after each test |
19 | clean Remove existing testing environment. | 19 | clean Remove existing testing environment. |
20 | travis Add if running on TravisCI. | 20 | ci Add if running on Unix CI. |
21 | appveyor Add if running on Appveyor. | 21 | appveyor Add if running on Appveyor. |
22 | os=<type> Set OS ("linux", "osx", or "windows"). | 22 | os=<type> Set OS ("linux", "osx", or "windows"). |
23 | lua_dir=<path> Path of Lua installation (default "/usr/local") | 23 | lua_dir=<path> Path of Lua installation (default "/usr/local") |
@@ -238,8 +238,8 @@ function test_env.set_args() | |||
238 | test_env.TEST_ENV_CLEAN = true | 238 | test_env.TEST_ENV_CLEAN = true |
239 | elseif argument == "verbose" then | 239 | elseif argument == "verbose" then |
240 | test_env.VERBOSE = true | 240 | test_env.VERBOSE = true |
241 | elseif argument == "travis" then | 241 | elseif argument == "ci" then |
242 | test_env.TRAVIS = true | 242 | test_env.CI = true |
243 | elseif argument == "appveyor" then | 243 | elseif argument == "appveyor" then |
244 | test_env.APPVEYOR = true | 244 | test_env.APPVEYOR = true |
245 | elseif argument:find("^os=") then | 245 | elseif argument:find("^os=") then |
@@ -273,13 +273,13 @@ function test_env.set_args() | |||
273 | local system = execute_output("uname -s") | 273 | local system = execute_output("uname -s") |
274 | if system == "Linux" then | 274 | if system == "Linux" then |
275 | test_env.TEST_TARGET_OS = "linux" | 275 | test_env.TEST_TARGET_OS = "linux" |
276 | if test_env.TRAVIS then | 276 | if test_env.CI then |
277 | test_env.OPENSSL_INCDIR = "/usr/include" | 277 | test_env.OPENSSL_INCDIR = "/usr/include" |
278 | test_env.OPENSSL_LIBDIR = "/usr/lib/x86_64-linux-gnu" | 278 | test_env.OPENSSL_LIBDIR = "/usr/lib/x86_64-linux-gnu" |
279 | end | 279 | end |
280 | elseif system == "Darwin" then | 280 | elseif system == "Darwin" then |
281 | test_env.TEST_TARGET_OS = "osx" | 281 | test_env.TEST_TARGET_OS = "osx" |
282 | if test_env.TRAVIS then | 282 | if test_env.CI then |
283 | test_env.OPENSSL_INCDIR = "/usr/local/opt/openssl/include" | 283 | test_env.OPENSSL_INCDIR = "/usr/local/opt/openssl/include" |
284 | test_env.OPENSSL_LIBDIR = "/usr/local/opt/openssl/lib" | 284 | test_env.OPENSSL_LIBDIR = "/usr/local/opt/openssl/lib" |
285 | end | 285 | end |
@@ -643,7 +643,7 @@ end | |||
643 | function test_env.setup_specs(extra_rocks) | 643 | function test_env.setup_specs(extra_rocks) |
644 | -- if global variable about successful creation of testing environment doesn't exist, build environment | 644 | -- if global variable about successful creation of testing environment doesn't exist, build environment |
645 | if not test_env.setup_done then | 645 | if not test_env.setup_done then |
646 | if test_env.TRAVIS then | 646 | if test_env.CI then |
647 | if not test_env.exists(os.getenv("HOME") .. "/.ssh/id_rsa.pub") then | 647 | if not test_env.exists(os.getenv("HOME") .. "/.ssh/id_rsa.pub") then |
648 | execute_bool("ssh-keygen -t rsa -P \"\" -f ~/.ssh/id_rsa") | 648 | execute_bool("ssh-keygen -t rsa -P \"\" -f ~/.ssh/id_rsa") |
649 | execute_bool("cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys") | 649 | execute_bool("cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys") |