aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtest/testing.sh17
1 files changed, 10 insertions, 7 deletions
diff --git a/test/testing.sh b/test/testing.sh
index 208f948b..f99fd8e3 100755
--- a/test/testing.sh
+++ b/test/testing.sh
@@ -249,9 +249,9 @@ mkdir -p "$testing_server"
249 get "$luarocks_repo/lmathx-20120430.51-1.rockspec" 249 get "$luarocks_repo/lmathx-20120430.51-1.rockspec"
250 get "$luarocks_repo/lmathx-20120430.52-1.rockspec" 250 get "$luarocks_repo/lmathx-20120430.52-1.rockspec"
251 get "$luarocks_repo/lmathx-20140620-1.rockspec" 251 get "$luarocks_repo/lmathx-20140620-1.rockspec"
252 get "$luarocks_repo/lua-path-0.2.3-1.rockspec" 252 get "$luarocks_repo/lua-path-0.2.3-1.src.rock"
253 get "$luarocks_repo/lua-cjson-2.1.0-1.rockspec" 253 get "$luarocks_repo/lua-cjson-2.1.0-1.src.rock"
254 get "$luarocks_repo/luacov-coveralls-0.1.1-1.rockspec" 254 get "$luarocks_repo/luacov-coveralls-0.1.1-1.src.rock"
255) 255)
256$luarocks_admin_nocov make_manifest "$testing_server" 256$luarocks_admin_nocov make_manifest "$testing_server"
257 257
@@ -276,6 +276,8 @@ build_environment() {
276 $luarocks_nocov pack --tree="$testing_sys_tree" $package; mv $package-*.rock "$testing_cache" 276 $luarocks_nocov pack --tree="$testing_sys_tree" $package; mv $package-*.rock "$testing_cache"
277 } 277 }
278 done 278 done
279 export LUA_PATH=
280 export LUA_CPATH=
279 eval `$luarocks_noecho_nocov path --bin` 281 eval `$luarocks_noecho_nocov path --bin`
280 cp -a "$testing_tree" "$testing_tree_copy" 282 cp -a "$testing_tree" "$testing_tree_copy"
281 cp -a "$testing_sys_tree" "$testing_sys_tree_copy" 283 cp -a "$testing_sys_tree" "$testing_sys_tree_copy"
@@ -526,13 +528,14 @@ run_all_tests() {
526run_all_tests $1 528run_all_tests $1
527#run_with_minimal_environment $1 529#run_with_minimal_environment $1
528 530
529$testing_sys_tree/bin/luacov -c $testing_dir/luacov.config src/luarocks src/bin
530
531if [ "$travis" ] 531if [ "$travis" ]
532then 532then
533 build_environment luacov luacov-coveralls 533 build_environment luacov luafilesystem luacov-coveralls
534 ( cd $testing_dir; $testing_sys_tree/bin/luacov-coveralls || exit 0 ) 534 echo "( cd $testing_dir && $testing_sys_tree/bin/luacov-coveralls || echo ok )"
535 ( cd $testing_dir; $testing_sys_tree/bin/luacov-coveralls || echo "ok" )
536 $testing_sys_tree/bin/luacov -c $testing_dir/luacov.config src/luarocks src/bin
535 grep "Summary" -B1 -A1000 $testing_dir/luacov.report.out 537 grep "Summary" -B1 -A1000 $testing_dir/luacov.report.out
536else 538else
539 $testing_sys_tree/bin/luacov -c $testing_dir/luacov.config src/luarocks src/bin
537 cat "$testing_dir/luacov.report.out" 540 cat "$testing_dir/luacov.report.out"
538fi 541fi