From cf02cd21e225f9c9c0eba8f3cf53567209bebe47 Mon Sep 17 00:00:00 2001
From: mpeterv <mpeterval@gmail.com>
Date: Mon, 4 Jan 2016 15:32:37 +0300
Subject: Upgrade to LuaCov 0.9.1, make coverage viewable

---
 test/testing.sh | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

(limited to 'test')

diff --git a/test/testing.sh b/test/testing.sh
index 70bd68b2..dc7912bf 100755
--- a/test/testing.sh
+++ b/test/testing.sh
@@ -119,20 +119,15 @@ upload_servers = {
 EOF
 cat <<EOF > $testing_dir/luacov.config
 return {
-  ["configfile"] = ".luacov",
-  ["statsfile"] = "$testing_dir/luacov.stats.out",
-  ["reportfile"] = "$testing_dir/luacov.report.out",
-  runreport = false,
-  deletestats = false,
-  ["include"] = {},
-  ["exclude"] = {
-    "luacov$",
-    "luacov%.reporter$",
-    "luacov%.defaults$",
-    "luacov%.runner$",
-    "luacov%.stats$",
-    "luacov%.tick$",
-  },
+   statsfile = "$testing_dir/luacov.stats.out",
+   reportfile = "$testing_dir/luacov.report.out",
+   modules = {
+      ["luarocks"] = "src/bin/luarocks",
+      ["luarocks-admin"] = "src/bin/luarocks-admin",
+      ["luarocks.*"] = "src",
+      ["luarocks.*.*"] = "src",
+      ["luarocks.*.*.*"] = "src"
+   }
 }
 EOF
 
@@ -184,7 +179,7 @@ srcdir_luasocket=luasocket-3.0-rc1
 version_cprint=0.1
 verrev_cprint=0.1-2
 
-version_luacov=0.8
+version_luacov=0.9.1
 verrev_luacov=${version_luacov}-1
 version_lxsh=0.8.6
 version_validate_args=1.5.4
@@ -591,16 +586,18 @@ run_all_tests() {
 run_all_tests $1
 #run_with_minimal_environment $1
 
+cd "$testing_dir/.."
+
 if [ "$travis" ]
 then
    if [ "$TRAVIS" ]
    then
       build_environment luacov luafilesystem luacov-coveralls
-      ( cd $testing_dir; $testing_sys_tree/bin/luacov-coveralls || echo "ok" )
+      $testing_sys_tree/bin/luacov-coveralls -c "$testing_dir/luacov.config" || echo "ok"
    fi
-   $testing_sys_tree/bin/luacov -c $testing_dir/luacov.config src/luarocks src/bin
-   grep "Summary" -B1 -A1000 $testing_dir/luacov.report.out
+   $testing_sys_tree/bin/luacov -c "$testing_dir/luacov.config"
+   grep "Summary" -B1 -A1000 "$testing_dir/luacov.report.out"
 else
-   $testing_sys_tree/bin/luacov -c $testing_dir/luacov.config src/luarocks src/bin
+   $testing_sys_tree/bin/luacov -c "$testing_dir/luacov.config"
    cat "$testing_dir/luacov.report.out"
 fi
-- 
cgit v1.2.3-55-g6feb


From 6f52c02e33e37078d595eb03b29332e6aaf0dce9 Mon Sep 17 00:00:00 2001
From: Jonathan Goble <jcgoble3@gmail.com>
Date: Fri, 22 Jan 2016 03:17:34 -0500
Subject: Update repo URLs to luarocks.org instead of rocks.moonscript.org

Previously, this used an old URL and downloaded over HTTP, in cleartext. This commit updates to the URL that the old one redirects to, and changes to HTTPS encryption for security. HTTPS is currently impossible on rocks.moonscript.org because the security certificate for that domain expired in May 2015.
---
 test/testing.bat | 2 +-
 test/testing.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/testing.bat b/test/testing.bat
index 319e12c3..7083678b 100644
--- a/test/testing.bat
+++ b/test/testing.bat
@@ -1,7 +1,7 @@
 @echo off
 Setlocal EnableDelayedExpansion EnableExtensions
 
-if not defined LUAROCKS_REPO set LUAROCKS_REPO=http://rocks.moonscript.org
+if not defined LUAROCKS_REPO set LUAROCKS_REPO=https://luarocks.org
 
 appveyor DownloadFile %LUAROCKS_REPO%/stdlib-41.0.0-1.src.rock
 luarocks build stdlib
diff --git a/test/testing.sh b/test/testing.sh
index dc7912bf..44e78205 100755
--- a/test/testing.sh
+++ b/test/testing.sh
@@ -225,7 +225,7 @@ luarocks_admin_nocov="run_lua --nocov luarocks-admin"
 mkdir -p "$testing_server"
 (
    cd "$testing_server"
-   luarocks_repo="http://rocks.moonscript.org"
+   luarocks_repo="https://luarocks.org"
    get() { [ -e `basename "$1"` ] || wget -c "$1"; }
    get "$luarocks_repo/luacov-${verrev_luacov}.src.rock"
    get "$luarocks_repo/luacov-${verrev_luacov}.rockspec"
-- 
cgit v1.2.3-55-g6feb