From 1d7cf245be8c4d855f1213ebfb76057cc34f6b4d Mon Sep 17 00:00:00 2001
From: Ivan Maidanski <ivmai@mail.ru>
Date: Thu, 22 Nov 2018 16:39:52 +0300
Subject: [PATCH] Travis CI: Pass -U GC_PRIVATE_H to cppcheck

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

diff --git a/.travis.yml b/.travis.yml
index 071f273e..073696eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,6 +37,16 @@ matrix:
   - os: linux
     env:
     - MAKEFILE_TARGETS="dist"
+  - os: linux
+    env:
+    - CPPCHECK_ENABLE="--enable=unusedFunction -D GC_BUILTIN_ATOMIC *.c *.cc cord/*.c cord/tests/*.c tests/*.c tests/*.cc tools/*.c"
+    - NO_CLONE_LIBATOMIC_OPS=true
+  - os: linux
+    env:
+    - CPPCHECK_ENABLE="-j4 --enable=information,performance,portability,style,warning *.c"
+  - os: linux
+    env:
+    - CPPCHECK_ENABLE="-j4 --enable=information,performance,portability,style,warning *.cc cord/*.c cord/tests/*.c extra/AmigaOS.c extra/MacOS.c extra/msvc_dbg.c extra/real_malloc.c extra/symbian.cpp tests/*.c tests/*.cc tools/*.c"
   - os: linux
     compiler: gcc
     env:
@@ -282,12 +292,6 @@ matrix:
     env:
     - CSA_CHECK=true
     - CFLAGS_EXTRA="-D ALL_INTERIOR_POINTERS -D CHECKSUMS -D DBG_HDRS_ALL -D DEBUG_THREADS -D ENABLE_TRACE -D GC_ALWAYS_MULTITHREADED -D GC_ASSERTIONS -D GC_ATOMIC_UNCOLLECTABLE -D GC_ENABLE_SUSPEND_THREAD -D GC_GCJ_SUPPORT -D GC_PRINT_BACK_HEIGHT -D GC_THREADS -D HANDLE_FORK -D JAVA_FINALIZATION -D KEEP_BACK_PTRS -D MAKE_BACK_GRAPH -D PARALLEL_MARK -D PRINT_BLACK_LIST -D THREAD_LOCAL_ALLOC -D USE_MMAP -D USE_MUNMAP"
-  - os: linux
-    env:
-    - CPPCHECK_ENABLE="-j16 --enable=information,performance,portability,style,warning extra/AmigaOS.c extra/MacOS.c extra/msvc_dbg.c extra/real_malloc.c extra/symbian.cpp"
-  - os: linux
-    env:
-    - CPPCHECK_ENABLE="--enable=unusedFunction"
   - os: linux
     compiler: clang
     env:
@@ -617,10 +621,9 @@ script:
         tests/*.c tests/*.cc tools/*.c;
   fi
 - if [[ "$CPPCHECK_ENABLE" != "" ]]; then
-    ~/cppcheck/cppcheck -q -f --error-exitcode=2 -U GC_API -D CPPCHECK
-        -I include -I libatomic_ops/src $CPPCHECK_ENABLE
-        *.cc cord/*.c cord/tests/*.c tests/*.c tests/*.cc tools/*.c
-        extra/gc.c;
+    set -o pipefail; ~/cppcheck/cppcheck --force --error-exitcode=2
+        -U GC_API -U GC_PRIVATE_H -D CPPCHECK -I include -I libatomic_ops/src
+        $CPPCHECK_ENABLE | grep --line-buffered "c ";
   fi
 - if [[ "$TESTS_CUSTOM_RUN" == true ]]; then
     ASAN_OPTIONS="detect_leaks=1" UBSAN_OPTIONS="halt_on_error=1"
-- 
2.40.0