diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2013-12-18 22:04:25 -0200 |
---|---|---|
committer | Hisham Muhammad <hisham@gobolinux.org> | 2013-12-18 22:04:25 -0200 |
commit | 0f172cbc35e3585aab443663e7c87f617c272833 (patch) | |
tree | 47b92bedbeb116fcbe53771a099f6962819269c5 /test | |
parent | 3f67e81a25607371efde249d83f1e9521349bb19 (diff) | |
download | luarocks-0f172cbc35e3585aab443663e7c87f617c272833.tar.gz luarocks-0f172cbc35e3585aab443663e7c87f617c272833.tar.bz2 luarocks-0f172cbc35e3585aab443663e7c87f617c272833.zip |
Fix some tests that only run locally.
Diffstat (limited to 'test')
-rwxr-xr-x | test/testing.sh | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/test/testing.sh b/test/testing.sh index d3ab3308..0386978a 100755 --- a/test/testing.sh +++ b/test/testing.sh | |||
@@ -158,8 +158,6 @@ version_validate_args=1.5.4 | |||
158 | verrev_validate_args=1.5.4-1 | 158 | verrev_validate_args=1.5.4-1 |
159 | verrev_lxsh=${version_lxsh}-2 | 159 | verrev_lxsh=${version_lxsh}-2 |
160 | 160 | ||
161 | # will change to luasec=luasec once LuaSec for Lua 5.2 is released | ||
162 | #luasec="http://luarocks.org/repositories/rocks-scm/luasec-scm-1.rockspec" | ||
163 | luasec=luasec | 161 | luasec=luasec |
164 | 162 | ||
165 | cd .. | 163 | cd .. |
@@ -388,13 +386,13 @@ test_unpack_binary() { rm -rf ./cprint-${verrev_cprint} && $luarocks build cprin | |||
388 | test_admin_help() { $luarocks_admin help; } | 386 | test_admin_help() { $luarocks_admin help; } |
389 | 387 | ||
390 | test_admin_make_manifest() { $luarocks_admin make_manifest; } | 388 | test_admin_make_manifest() { $luarocks_admin make_manifest; } |
391 | test_admin_add_rsync() { if [ "$travis" ]; then return; fi; $luarocks_admin --server=testing add ./luasocket-${verrev_luasocket}.src.rock; } | 389 | test_admin_add_rsync() { if [ "$travis" ]; then return; fi; $luarocks_admin --server=testing add "$testing_server/luasocket-${verrev_luasocket}.src.rock"; } |
392 | test_admin_add_sftp() { if [ "$travis" ]; then return; fi; export LUAROCKS_CONFIG="$testing_dir/testing_config_sftp.lua" && $luarocks_admin --server=testing add ./luasocket-${verrev_luasocket}.src.rock; export LUAROCKS_CONFIG="$testing_dir/testing_config.lua"; } | 390 | test_admin_add_sftp() { if [ "$travis" ]; then return; fi; export LUAROCKS_CONFIG="$testing_dir/testing_config_sftp.lua" && $luarocks_admin --server=testing add ./luasocket-${verrev_luasocket}.src.rock; export LUAROCKS_CONFIG="$testing_dir/testing_config.lua"; } |
393 | fail_admin_add_missing() { $luarocks_admin --server=testing add; } | 391 | fail_admin_add_missing() { $luarocks_admin --server=testing add; } |
394 | fail_admin_invalidserver() { $luarocks_admin --server=invalid add ./luasocket-${verrev_luasocket}.src.rock; } | 392 | fail_admin_invalidserver() { $luarocks_admin --server=invalid add "$testing_server/luasocket-${verrev_luasocket}.src.rock"; } |
395 | fail_admin_invalidrock() { if [ "$travis" ]; then return 1; fi; $luarocks_admin --server=testing add invalid; } | 393 | fail_admin_invalidrock() { if [ "$travis" ]; then return 1; fi; $luarocks_admin --server=testing add invalid; } |
396 | test_admin_refresh_cache() { if [ "$travis" ]; then return; fi; $luarocks_admin --server=testing refresh_cache; } | 394 | test_admin_refresh_cache() { if [ "$travis" ]; then return; fi; $luarocks_admin --server=testing refresh_cache; } |
397 | test_admin_remove() { if [ "$travis" ]; then return; fi; $luarocks_admin --server=testing remove ./luasocket-${verrev_luasocket}.src.rock; } | 395 | test_admin_remove() { if [ "$travis" ]; then return; fi; $luarocks_admin --server=testing remove luasocket-${verrev_luasocket}.src.rock; } |
398 | fail_admin_remove_missing() { $luarocks_admin --server=testing remove; } | 396 | fail_admin_remove_missing() { $luarocks_admin --server=testing remove; } |
399 | 397 | ||
400 | fail_deps_mode_invalid_arg() { $luarocks remove luacov --deps-mode; } | 398 | fail_deps_mode_invalid_arg() { $luarocks remove luacov --deps-mode; } |