Update cppcheck commit and pass predefined params to avoid impossible…

… combinations of configs
commaai · Jul 9, 2019 · 4be8582 · 4be8582
1 parent f45dd04
commit 4be8582
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/tests/misra/test_misra.sh b/tests/misra/test_misra.sh
@@ -3,12 +3,12 @@
 git clone https://github.com/danmar/cppcheck.git || true
 cd cppcheck
 git fetch
-git checkout 44d6066c6fad32e2b0332b3f2b24bd340febaef8
+git checkout 862c4ef87b109ae86c2d5f12769b7c8d199f35c5
 make -j4
 cd ../../../
 
 # panda code
-tests/misra/cppcheck/cppcheck -DCAN3 -DUID_BASE --suppressions-list=tests/misra/suppressions.txt --dump --enable=all --inline-suppr --force board/main.c 2>/tmp/misra/cppcheck_output.txt || true
+tests/misra/cppcheck/cppcheck -DPANDA -UPEDAL -DCAN3 -DUID_BASE --suppressions-list=tests/misra/suppressions.txt --dump --enable=all --inline-suppr --force board/main.c 2>/tmp/misra/cppcheck_output.txt || true
 python tests/misra/cppcheck/addons/misra.py board/main.c.dump 2>/tmp/misra/misra_output.txt || true
 
 # violations in safety files
@@ -24,5 +24,5 @@ then
 fi
 
 # pedal code
-tests/misra/cppcheck/cppcheck -UCAN3 --suppressions-list=tests/misra/suppressions.txt -I board/ --dump --enable=all --inline-suppr --force board/pedal/main.c 2>/tmp/misra/cppcheck_pedal_output.txt || true
+tests/misra/cppcheck/cppcheck -UPANDA -DPEDAL -UCAN3 --suppressions-list=tests/misra/suppressions.txt -I board/ --dump --enable=all --inline-suppr --force board/pedal/main.c 2>/tmp/misra/cppcheck_pedal_output.txt || true
 python tests/misra/cppcheck/addons/misra.py board/pedal/main.c.dump 2>/tmp/misra/misra_pedal_output.txt || true