From 095e2258c56d2d839ed71e5ffb5aa17cedfba771 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 16 Apr 2015 00:17:42 +0300 Subject: [PATCH] Strange "unknown pseudo-op" errors. Try use gcc 4.8 instead 4.6. --HG-- branch : develop --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index ee46b0d2e..17ed57a9d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,11 +15,18 @@ env: - secure: "DO0hLop827D9LXcCxMQ3AmSowl1fC8NPeU/um5Jc0aJqnBvizw4BTWyXyYPlCzci1Lx+4SlRAFBttd0FIMIUEi/9atLR9zSivwLCZ86HaP2gJjzOz/TjM+ZQUcIHsZ2x1kf2dngEoWG5Ur3sa9T+HYd9t32F+aO/PjjN5wFtI6I=" before_install: + # g++4.8.1 + - if [ "$CXX" == "g++" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi - sudo add-apt-repository ppa:ubuntu-sdk-team/ppa -y - sudo apt-get update -qq - sudo apt-get install -y qtbase5-dev libqt5svg5-dev ccache qt5-default qttools5-dev-tools libqt5xmlpatterns5-dev - sudo apt-get install -y libqt5core5 libqt5gui5 libqt5printsupport5 libqt5svg5 libqt5widgets5 libqt5xml5 libqt5xmlpatterns5 xpdf cppcheck +install: + # g++4.8.1 + - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.8; fi + - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8"; fi + before_script: # QTestLib require GUI support for some tests - "export DISPLAY=:99.0" @@ -32,6 +39,7 @@ before_script: - qmake ../Valentina.pro -r script: + - $CXX --version - cppcheck --error-exitcode=1 --quiet --inline-suppr --template '{file}:{line}:{message}:{id}' --std=posix --enable=performance,portability ../src - make -j$(nproc) - DISPLAY=:99.0 make check