From 33284be64a99fc56eb93a848b0a651e8a58e19c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Sun, 14 Jul 2019 21:56:33 +0200
Subject: [PATCH] Try to fix Travis

---
 .travis.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3df4e5b43..f6713e47c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -209,9 +209,9 @@ script:
   - make -s test -j2 CPPFLAGS=-DTEST_MATHLIB_VALUE
   - touch lib/mathlib.cpp test/testmathlib.cpp
 # compile cppcheck with -DNONNEG
-#  - echo $CXXFLAGS
-#  - make -s CPPFLAGS=-DNONNEG -j2
-#  - make clean
+  - echo $CXXFLAGS
+  - make -s CPPFLAGS=-DNONNEG -j2
+  - make clean
 # compile cppcheck, default build
   - echo $CXXFLAGS
   - make -s test -j2
@@ -223,9 +223,9 @@ script:
 # building gui generates some more files that cppcheck can check, so check the repo *after* building gui
   - cd ../
 # self check
-  - ${CPPCHECK} --template=gcc -D__CPPCHECK__ -f --error-exitcode=1 --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml/ -Icli --inconclusive --enable=style,performance,portability,warning,internal --exception-handling --inline-suppr --suppressions-list=.travis_suppressions -itest/cli -itest/synthetic -itest/testsuites -iaddons  -igui cli lib gui test tools -j 2
+  - ${CPPCHECK} --template=gcc -D__CPPCHECK__ --error-exitcode=1 --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml/ -Icli --inconclusive --enable=style,performance,portability,warning,internal --exception-handling --inline-suppr --suppressions-list=.travis_suppressions -itest/cli -itest/synthetic -itest/testsuites -iaddons  -igui cli lib gui test tools -j 2
 # check gui with qt settings
-  - ${CPPCHECK} --template=gcc --library=qt  --error-exitcode=1  -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml/ -Icli --enable=style,performance,portability,warning,internal  --exception-handling -j 2 gui --suppressions-list=.travis_suppressions -igui/test
+  - ${CPPCHECK} --template=gcc -D__CPPCHECK__ --library=qt --error-exitcode=1  -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml/ -Icli --enable=style,performance,portability,warning,internal  --exception-handling -j 2 gui --suppressions-list=.travis_suppressions -igui/test
 # check naming conventions
   - ${CPPCHECK} -i gui/test -j 2 --dump -q gui lib
   - find lib gui -maxdepth 1 -name "*.dump" | xargs -n 1 -P 4 python addons/naming.py --private-member-variable='m[A-Z].*'