diff options
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/README.md | 1 | ||||
| -rw-r--r-- | spec/util/test_env.lua | 13 |
2 files changed, 2 insertions, 12 deletions
diff --git a/spec/README.md b/spec/README.md index f2777eaa..0249ad04 100644 --- a/spec/README.md +++ b/spec/README.md | |||
| @@ -26,7 +26,6 @@ LuaRocks folder or specify with *-C* flag. | |||
| 26 | env=<type>, (default:"minimal") type what kind of environment to use ["minimal", "full"] | 26 | env=<type>, (default:"minimal") type what kind of environment to use ["minimal", "full"] |
| 27 | noreset, Don't reset environment after each test | 27 | noreset, Don't reset environment after each test |
| 28 | clean, remove existing testing environment | 28 | clean, remove existing testing environment |
| 29 | appveyor, add just if running on Appveyor | ||
| 30 | ci, add just if running on Unix CI | 29 | ci, add just if running on Unix CI |
| 31 | ci-windows, add just if running on Windows CI | 30 | ci-windows, add just if running on Windows CI |
| 32 | os=<version>, type your OS ["linux", "os x", "windows"] | 31 | os=<version>, type your OS ["linux", "os x", "windows"] |
diff --git a/spec/util/test_env.lua b/spec/util/test_env.lua index 69874d79..da293b45 100644 --- a/spec/util/test_env.lua +++ b/spec/util/test_env.lua | |||
| @@ -20,7 +20,6 @@ ARGUMENTS | |||
| 20 | clean Remove existing testing environment. | 20 | clean Remove existing testing environment. |
| 21 | ci Add if running on Unix CI. | 21 | ci Add if running on Unix CI. |
| 22 | ci-windows Add if running on Windows CI. | 22 | ci-windows Add if running on Windows CI. |
| 23 | appveyor Add if running on Appveyor. | ||
| 24 | os=<type> Set OS ("linux", "osx", or "windows"). | 23 | os=<type> Set OS ("linux", "osx", or "windows"). |
| 25 | lua_dir=<path> Path of Lua installation (default "/usr/local") | 24 | lua_dir=<path> Path of Lua installation (default "/usr/local") |
| 26 | lua=<lua> Name of the interpreter, may be full path (default "lua") | 25 | lua=<lua> Name of the interpreter, may be full path (default "lua") |
| @@ -354,8 +353,6 @@ function test_env.set_args() | |||
| 354 | test_env.CI = true | 353 | test_env.CI = true |
| 355 | elseif argument == "ci-windows" then | 354 | elseif argument == "ci-windows" then |
| 356 | test_env.CI_WINDOWS = true | 355 | test_env.CI_WINDOWS = true |
| 357 | elseif argument == "appveyor" then | ||
| 358 | test_env.APPVEYOR = true | ||
| 359 | elseif argument:find("^os=") then | 356 | elseif argument:find("^os=") then |
| 360 | test_env.TEST_TARGET_OS = argument:match("^os=(.*)$") | 357 | test_env.TEST_TARGET_OS = argument:match("^os=(.*)$") |
| 361 | elseif argument == "mingw" then | 358 | elseif argument == "mingw" then |
| @@ -376,12 +373,6 @@ function test_env.set_args() | |||
| 376 | 373 | ||
| 377 | if dir_sep == "\\" then | 374 | if dir_sep == "\\" then |
| 378 | test_env.TEST_TARGET_OS = "windows" | 375 | test_env.TEST_TARGET_OS = "windows" |
| 379 | if test_env.APPVEYOR then | ||
| 380 | test_env.OPENSSL_INCDIR = "C:\\OpenSSL-v111-Win32\\include" | ||
| 381 | test_env.OPENSSL_LIBDIR = "C:\\OpenSSL-v111-Win32\\lib" | ||
| 382 | if test_env.MINGW then | ||
| 383 | test_env.OPENSSL_LIBDIR = "C:\\OpenSSL-v111-Win32\\bin" | ||
| 384 | end | ||
| 385 | elseif test_env.CI_WINDOWS then | 376 | elseif test_env.CI_WINDOWS then |
| 386 | if test_env.MINGW then | 377 | if test_env.MINGW then |
| 387 | test_env.OPENSSL_INCDIR = "c:\\msys64\\ucrt64\\include" | 378 | test_env.OPENSSL_INCDIR = "c:\\msys64\\ucrt64\\include" |
| @@ -686,8 +677,8 @@ local function build_environment(rocks, env_variables) | |||
| 686 | lfs.mkdir(testing_paths.testing_deps_tree) | 677 | lfs.mkdir(testing_paths.testing_deps_tree) |
| 687 | 678 | ||
| 688 | test_env.run.luarocks_admin_nocov(C("make_manifest", Q(testing_paths.testing_server))) | 679 | test_env.run.luarocks_admin_nocov(C("make_manifest", Q(testing_paths.testing_server))) |
| 689 | test_env.run.luarocks_admin_nocov(C("make_manifest", Q(testing_paths.testing_cache))) | 680 | test_env.run.luarocks_admin_nocov(C("make_manifest", Q(testing_paths.testing_cache))) |
| 690 | 681 | ||
| 691 | if test_env.MSVCRT then | 682 | if test_env.MSVCRT then |
| 692 | test_env.run.luarocks_nocov(C("config", "variables.MSVCRT", Q(test_env.MSVCRT), Q("--tree=" .. testing_paths.testing_cache))) | 683 | test_env.run.luarocks_nocov(C("config", "variables.MSVCRT", Q(test_env.MSVCRT), Q("--tree=" .. testing_paths.testing_cache))) |
| 693 | end | 684 | end |
