diff options
| author | roboo <robo.karasek@gmail.com> | 2016-08-22 21:01:23 +0200 |
|---|---|---|
| committer | roboo <robo.karasek@gmail.com> | 2016-08-22 21:01:23 +0200 |
| commit | 6d9c9997645c07ed93719d85e260d9ffbc2d1d25 (patch) | |
| tree | 666475e30cf2afa35dc966fcfa45f37978eaee1c /spec/build_spec.lua | |
| parent | 7225a3d4513137a8e13a5db39538e007b8faa886 (diff) | |
| download | luarocks-6d9c9997645c07ed93719d85e260d9ffbc2d1d25.tar.gz luarocks-6d9c9997645c07ed93719d85e260d9ffbc2d1d25.tar.bz2 luarocks-6d9c9997645c07ed93719d85e260d9ffbc2d1d25.zip | |
Change APPVEYOR_OPENSSL to OPENSSL_DIRS for better test readability
Diffstat (limited to 'spec/build_spec.lua')
| -rw-r--r-- | spec/build_spec.lua | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/spec/build_spec.lua b/spec/build_spec.lua index b4f838ca..8f08f0a0 100644 --- a/spec/build_spec.lua +++ b/spec/build_spec.lua | |||
| @@ -120,11 +120,7 @@ describe("LuaRocks build tests #blackbox #b_build", function() | |||
| 120 | end) | 120 | end) |
| 121 | 121 | ||
| 122 | it("LuaRocks build luasec with skipping dependency checks", function() | 122 | it("LuaRocks build luasec with skipping dependency checks", function() |
| 123 | if test_env.APPVEYOR then | 123 | assert.is_true(run.luarocks_bool("build luasec " .. test_env.OPENSSL_DIRS .. " --nodeps")) |
| 124 | assert.is_true(run.luarocks_bool("build luasec " .. test_env.APPVEYOR_OPENSSL .. " --nodeps")) | ||
| 125 | else | ||
| 126 | assert.is_true(run.luarocks_bool("build luasec --nodeps")) | ||
| 127 | end | ||
| 128 | assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/luasec/0.6-1/luasec-0.6-1.rockspec")) | 124 | assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/luasec/0.6-1/luasec-0.6-1.rockspec")) |
| 129 | end) | 125 | end) |
| 130 | 126 | ||
| @@ -150,11 +146,7 @@ describe("LuaRocks build tests #blackbox #b_build", function() | |||
| 150 | end | 146 | end |
| 151 | 147 | ||
| 152 | it("LuaRocks build luasec only deps", function() | 148 | it("LuaRocks build luasec only deps", function() |
| 153 | if test_env.APPVEYOR then | 149 | assert.is_true(run.luarocks_bool(test_env.quiet("build luasec " .. test_env.OPENSSL_DIRS .. " --only-deps"))) |
| 154 | assert.is_true(run.luarocks_bool(test_env.quiet("build luasec " .. test_env.APPVEYOR_OPENSSL .. " --only-deps"))) | ||
| 155 | else | ||
| 156 | assert.is_true(run.luarocks_bool(test_env.quiet("build luasec --only-deps"))) | ||
| 157 | end | ||
| 158 | assert.is_false(run.luarocks_bool("show luasec")) | 150 | assert.is_false(run.luarocks_bool("show luasec")) |
| 159 | assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/luasec/0.6-1/luasec-0.6-1.rockspec")) | 151 | assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/luasec/0.6-1/luasec-0.6-1.rockspec")) |
| 160 | end) | 152 | end) |
| @@ -189,12 +181,8 @@ describe("LuaRocks build tests #blackbox #b_build", function() | |||
| 189 | 181 | ||
| 190 | it("LuaRocks build with https", function() | 182 | it("LuaRocks build with https", function() |
| 191 | assert.is_true(run.luarocks_bool("download --rockspec validate-args 1.5.4-1")) | 183 | assert.is_true(run.luarocks_bool("download --rockspec validate-args 1.5.4-1")) |
| 184 | assert.is_true(run.luarocks_bool(test_env.quiet("install luasec " .. test_env.OPENSSL_DIRS))) | ||
| 192 | 185 | ||
| 193 | if test_env.APPVEYOR then | ||
| 194 | assert.is_true(run.luarocks_bool(test_env.quiet("install luasec " .. test_env.APPVEYOR_OPENSSL))) | ||
| 195 | else | ||
| 196 | assert.is_true(run.luarocks_bool(test_env.quiet("install luasec"))) | ||
| 197 | end | ||
| 198 | assert.is_true(run.luarocks_bool("build validate-args-1.5.4-1.rockspec")) | 186 | assert.is_true(run.luarocks_bool("build validate-args-1.5.4-1.rockspec")) |
| 199 | assert.is.truthy(run.luarocks("show validate-args")) | 187 | assert.is.truthy(run.luarocks("show validate-args")) |
| 200 | assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/validate-args/1.5.4-1/validate-args-1.5.4-1.rockspec")) | 188 | assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/validate-args/1.5.4-1/validate-args-1.5.4-1.rockspec")) |
