travis: use gcc-5 if possible

Better support for address and leak sanitizer

diff --git a/tests/ci/install.sh b/tests/ci/install.sh
index 62700e18c0d4477b820b8013c9343d85901d5a10..369d234ab7e1d8b6b7662f998fe1750439898fa5 100755 (executable)
--- a/tests/ci/install.sh
+++ b/tests/ci/install.sh
@@ -4,18 +4,21 @@ set -e
 
 case "$(uname -s)" in
     Darwin)
-        # OS X
         brew update
         brew install libevent jansson libxml2 check net-snmp
         ;;
     Linux)
-        # Linux
+        # We prefer gcc-5
+        [ $CC != gcc ] || \
+            sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
         sudo apt-get -qqy update
         sudo apt-get -qqy install \
             automake autoconf libtool pkg-config \
             libsnmp-dev libxml2-dev libjansson-dev \
             libevent-dev libreadline-dev libbsd-dev \
-            check
+            check libc6-dbg libevent-dbg
+        [ $CC != gcc ] || \
+            sudo apt-get -qqy install gcc-5
         # For integration tests
         sudo -H $(which python3) -m pip install -r tests/integration/requirements.txt
         ;;

diff --git a/tests/ci/run.sh b/tests/ci/run.sh
index 82473b64b663aaf5144f038b5c464f92b92777b0..39d589f85d96584122dcd41077a0e859b5f5d997 100755 (executable)
--- a/tests/ci/run.sh
+++ b/tests/ci/run.sh
@@ -20,6 +20,8 @@ case "${RUN_COVERITY}","${TRAVIS_BRANCH}" in
         ;;
 esac
 
+[ $CC != gcc ] || CC=gcc-5
+
 ./autogen.sh
 ./configure $LLDPD_CONFIG_ARGS \
             --enable-pie \