From 4be858224fd7093ed81e9fbbffdd2819a01ad434 Mon Sep 17 00:00:00 2001 From: Riccardo Date: Mon, 8 Jul 2019 18:20:00 -0700 Subject: [PATCH] Update cppcheck commit and pass predefined params to avoid impossible combinations of configs --- tests/misra/test_misra.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/misra/test_misra.sh b/tests/misra/test_misra.sh index 10501db386c23b..5b80b9c906d244 100755 --- 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