From ef5b27a82ebc3be576d8646de87831bec0d40289 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 12 Jan 2017 03:16:23 +0300 Subject: Remove gcov from ci i386 builds, because they failing with out of memory. --- .gitlab-ci.yml | 8 ++++---- tools/ci/jobs/gcc6_sdl2_tests.sh | 2 -- tools/ci/jobs/gcc6_sdl2_tests_gcov.sh | 31 +++++++++++++++++++++++++++++++ tools/ci/jobs/gcc6_tests.sh | 2 -- tools/ci/jobs/gcc6_tests_gcov.sh | 31 +++++++++++++++++++++++++++++++ 5 files changed, 66 insertions(+), 8 deletions(-) create mode 100755 tools/ci/jobs/gcc6_sdl2_tests_gcov.sh create mode 100755 tools/ci/jobs/gcc6_tests_gcov.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5d7094873..565fb4ef4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -186,10 +186,10 @@ gcc-5_tests_i386: tags: - docker -gcc-6_tests: +gcc-6_tests_gcov: stage: build script: - - ./tools/ci/jobs/gcc6_tests.sh + - ./tools/ci/jobs/gcc6_tests_gcov.sh image: debian:unstable <<: *job-artifacts tags: @@ -222,10 +222,10 @@ gcc-6_tests_no_opengl_i386: tags: - docker -gcc-6_sdl2_tests: +gcc-6_sdl2_tests_gcov: stage: build script: - - ./tools/ci/jobs/gcc6_sdl2_tests.sh + - ./tools/ci/jobs/gcc6_sdl2_tests_gcov.sh image: debian:unstable <<: *job-artifacts tags: diff --git a/tools/ci/jobs/gcc6_sdl2_tests.sh b/tools/ci/jobs/gcc6_sdl2_tests.sh index 0c07757c2..0887e61aa 100755 --- a/tools/ci/jobs/gcc6_sdl2_tests.sh +++ b/tools/ci/jobs/gcc6_sdl2_tests.sh @@ -10,7 +10,6 @@ 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 \ @@ -24,7 +23,6 @@ do_init 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_sdl2_tests_gcov.sh b/tools/ci/jobs/gcc6_sdl2_tests_gcov.sh new file mode 100755 index 000000000..0c07757c2 --- /dev/null +++ b/tools/ci/jobs/gcc6_sdl2_tests_gcov.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +export CC=gcc-6 +export CXX=g++-6 +export LOGFILE=gcc6.log + +source ./tools/ci/scripts/init.sh + +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 \ +-Wstrict-overflow=1 -Wformat=1 -D_FORTIFY_SOURCE=2 \ +-std=gnu++1z -Wformat=1 \ +-Wno-attributes" + +source ./tools/ci/flags/gcc6.sh + +do_init +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 + +exit 0 diff --git a/tools/ci/jobs/gcc6_tests.sh b/tools/ci/jobs/gcc6_tests.sh index 97029b872..2c56759fa 100755 --- a/tools/ci/jobs/gcc6_tests.sh +++ b/tools/ci/jobs/gcc6_tests.sh @@ -10,7 +10,6 @@ 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 \ @@ -24,7 +23,6 @@ do_init 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/gcc6_tests_gcov.sh b/tools/ci/jobs/gcc6_tests_gcov.sh new file mode 100755 index 000000000..97029b872 --- /dev/null +++ b/tools/ci/jobs/gcc6_tests_gcov.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +export CC=gcc-6 +export CXX=g++-6 +export LOGFILE=gcc6.log + +source ./tools/ci/scripts/init.sh + +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 \ +-Wstrict-overflow=1 -Wformat=1 -D_FORTIFY_SOURCE=2 \ +-std=gnu++1z -Wformat=1 \ +-Wno-attributes" + +source ./tools/ci/flags/gcc6.sh + +do_init +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 + +exit 0 -- cgit v1.2.3-60-g2f50