From d066ae70cd667bc17635a4d1bbd6fcb0d676fcec Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sat, 9 Dec 2023 15:48:33 -0800 Subject: [PATCH] ensure MISRA coverage table is always up to date (#1772) * ensure MISRA coverage table is always up to date * update comment --- tests/misra/.gitignore | 4 ++-- tests/misra/coverage_table | 28 ++++++++++++++-------------- tests/misra/test_misra.sh | 10 ++++++++-- 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/tests/misra/.gitignore b/tests/misra/.gitignore index 0750b611..8432f605 100644 --- a/tests/misra/.gitignore +++ b/tests/misra/.gitignore @@ -1,4 +1,4 @@ *.pdf +*.txt +new_table cppcheck/ - -MISRA_C_2012.txt diff --git a/tests/misra/coverage_table b/tests/misra/coverage_table index 9dc89bd4..36edbf78 100644 --- a/tests/misra/coverage_table +++ b/tests/misra/coverage_table @@ -4,7 +4,7 @@ 2.1 X (Cppcheck) 2.2 X (Cppcheck) 2.3 -2.4 X (Cppcheck) +2.4 2.5 2.6 X (Cppcheck) 2.7 X (Addon) @@ -14,21 +14,21 @@ 4.2 X (Addon) 5.1 X (Addon) 5.2 X (Addon) -5.3 X (Addon) +5.3 X (Cppcheck) 5.4 X (Addon) 5.5 X (Addon) 5.6 5.7 5.8 5.9 -6.1 -6.2 +6.1 X (Addon) +6.2 X (Addon) 7.1 X (Addon) -7.2 +7.2 X (Addon) 7.3 X (Addon) -7.4 +7.4 X (Addon) 8.1 -8.2 +8.2 X (Addon) 8.3 X (Cppcheck) 8.4 8.5 @@ -42,12 +42,12 @@ 8.13 8.14 X (Addon) 9.1 -9.2 -9.3 -9.4 +9.2 X (Addon) +9.3 X (Addon) +9.4 X (Addon) 9.5 X (Addon) 10.1 X (Addon) -10.2 +10.2 X (Addon) 10.3 10.4 X (Addon) 10.5 @@ -66,7 +66,7 @@ 12.1 X (Addon) 12.2 X (Addon) 12.3 X (Addon) -12.4 X (Addon) +12.4 13.1 X (Addon) 13.2 X (Cppcheck) 13.3 X (Addon) @@ -75,12 +75,12 @@ 13.6 X (Addon) 14.1 X (Addon) 14.2 X (Addon) -14.3 X (Cppcheck) +14.3 14.4 X (Addon) 15.1 X (Addon) 15.2 X (Addon) 15.3 X (Addon) -15.4 +15.4 X (Addon) 15.5 X (Addon) 15.6 X (Addon) 15.7 X (Addon) diff --git a/tests/misra/test_misra.sh b/tests/misra/test_misra.sh index 65624df6..e9a501bd 100755 --- a/tests/misra/test_misra.sh +++ b/tests/misra/test_misra.sh @@ -24,8 +24,14 @@ if [ ! -d $CPPCHECK_DIR ]; then $DIR/install.sh fi -# generate coverage matrix -#python tests/misra/cppcheck/addons/misra.py -generate-table > tests/misra/coverage_table +# ensure checked in coverage table is up to date +cd $DIR +python $CPPCHECK_DIR/addons/misra.py -generate-table > new_table +if ! cmp -s new_table coverage_table; then + echo "MISRA coverage table doesn't match. Update and commit:" + echo "mv new_table coverage_table && git add . && git commit -m 'update table'" + exit 1 +fi cd $PANDA_DIR scons -j8