From a8093d62e3e1380732489660228782c409b0017a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 11 Jan 2017 17:01:10 +0300 Subject: Add support for collecting coverage data in gcc6 tests and store on stats web site. --- tools/ci/jobs/gcc6_sdl2_tests.sh | 4 +++- tools/ci/jobs/gcc6_tests.sh | 4 +++- tools/ci/jobs/pages.sh | 7 ++++++- tools/ci/scripts/init.sh | 7 +++++++ 4 files changed, 19 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/ci/jobs/gcc6_sdl2_tests.sh b/tools/ci/jobs/gcc6_sdl2_tests.sh index 41940cb08..0c07757c2 100755 --- a/tools/ci/jobs/gcc6_sdl2_tests.sh +++ b/tools/ci/jobs/gcc6_sdl2_tests.sh @@ -10,6 +10,7 @@ aptget_install gcc-6 g++-6 \ make autoconf automake autopoint gettext libphysfs-dev \ libxml2-dev libcurl4-gnutls-dev libpng-dev \ libsdl2-dev libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev \ + gcovr \ valgrind export CXXFLAGS="-pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \ @@ -20,9 +21,10 @@ export CXXFLAGS="-pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \ source ./tools/ci/flags/gcc6.sh do_init -run_configure --enable-unittests=yes --with-sdl2 $* +run_configure --enable-unittests=yes --with-sdl2 --with-gcov $* export SDL_VIDEODRIVER=dummy run_make_check +run_gcov gcov-6 gcc-6_SDL2 source ./tools/ci/scripts/exit.sh diff --git a/tools/ci/jobs/gcc6_tests.sh b/tools/ci/jobs/gcc6_tests.sh index 1a2fdb978..97029b872 100755 --- a/tools/ci/jobs/gcc6_tests.sh +++ b/tools/ci/jobs/gcc6_tests.sh @@ -10,6 +10,7 @@ aptget_install gcc-6 g++-6 \ make autoconf automake autopoint gettext libphysfs-dev \ libxml2-dev libcurl4-gnutls-dev libpng-dev \ libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev \ + gcovr \ valgrind export CXXFLAGS="-pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \ @@ -20,9 +21,10 @@ export CXXFLAGS="-pedantic -ggdb3 -O2 -pipe -Wstrict-aliasing=2 \ source ./tools/ci/flags/gcc6.sh do_init -run_configure --enable-unittests=yes $* +run_configure --enable-unittests=yes --with-gcov $* export SDL_VIDEODRIVER=dummy run_make_check +run_gcov gcov-6 gcc-6 source ./tools/ci/scripts/exit.sh diff --git a/tools/ci/jobs/pages.sh b/tools/ci/jobs/pages.sh index 2c12253db..0e3c2b020 100755 --- a/tools/ci/jobs/pages.sh +++ b/tools/ci/jobs/pages.sh @@ -4,15 +4,20 @@ export LOGFILE=pages.log source ./tools/ci/scripts/init.sh -aptget_install git-core +aptget_install git-core python tools/ci/scripts/retry.sh git clone https://gitlab.com/4144/pagesindexgen.git pagesindexgen mkdir -p public/docs mkdir -p public/stats +mkdir -p public/gcov + +cp logs/gcc-6.* public/gcov +cp logs/gcc-6_SDL2.* public/gcov cd pagesindexgen ./pagesindexgen.py ../public +check_error $? cd .. cp -r doxygen/html/* public/docs diff --git a/tools/ci/scripts/init.sh b/tools/ci/scripts/init.sh index 944d4d338..c89717306 100755 --- a/tools/ci/scripts/init.sh +++ b/tools/ci/scripts/init.sh @@ -217,6 +217,13 @@ function run_make_check { echo "valgrind check" } +function run_gcov { + gcovr -r . --gcov-executable=$1 --html -o logs/$2.html + check_error $? + gcovr -r . --gcov-executable=$1 -o logs/$2.txt + check_error $? +} + function run_check_warnings { DATA=$(cat $ERRFILE) if [ "$DATA" != "" ]; -- cgit v1.2.3-60-g2f50