From 4f9d887aa0bbd1cf2579fdff42f8a7b3c1f13f98 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Fri, 18 Mar 2016 19:46:08 +0100 Subject: [PATCH] travis: use gcc-5 if possible Better support for address and leak sanitizer --- tests/ci/install.sh | 9 ++++++--- tests/ci/run.sh | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tests/ci/install.sh b/tests/ci/install.sh index 62700e18..369d234a 100755 --- 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 82473b64..39d589f8 100755 --- 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 \ -- 2.39.5