Add tests for MISRA tests in --std=c11 to test #12515

danmar · Mar 14, 2024 · 08dcdbe · 08dcdbe
1 parent b6d8889
commit 08dcdbe
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 0 deletions.
diff --git a/.github/workflows/CI-unixish.yml b/.github/workflows/CI-unixish.yml
@@ -465,6 +465,9 @@ jobs:
           # rules 5.4 and 5.5 which have standard-dependent options.
           ../../cppcheck --dump -DDUMMY --suppress=uninitvar --inline-suppr misra/misra-test.c --std=c89 --platform=unix64 
           python3 ../misra.py -verify misra/misra-test.c.dump
+          # Test slight MISRA differences in C11 standard
+          ../../cppcheck --dump -DDUMMY --suppress=uninitvar --inline-suppr misra/misra-test-c11.c --std=c11 --platform=unix64
+          python3 ../misra.py -verify misra/misra-test-c11.c.dump
           # TODO: do we need to verify something here?
           ../../cppcheck --dump -DDUMMY --suppress=uninitvar --suppress=uninitStructMember --std=c89 misra/misra-test.h
           ../../cppcheck --dump misra/misra-test.cpp 

diff --git a/.github/workflows/CI-windows.yml b/.github/workflows/CI-windows.yml
@@ -200,6 +200,9 @@ jobs:
           rem rules 5.4 and 5.5 which have standard-dependent options.
           ..\..\cppcheck --dump -DDUMMY --suppress=uninitvar --inline-suppr misra\misra-test.c --std=c89 --platform=unix64 || exit /b !errorlevel!
           python3 ..\misra.py -verify misra\misra-test.c.dump || exit /b !errorlevel!
+          rem Test slight MISRA differences in C11 standard
+          ..\..\cppcheck --dump -DDUMMY --suppress=uninitvar --inline-suppr misra\misra-test-c11.c --std=c11 --platform=unix64 || exit /b !errorlevel!
+          python3 ..\misra.py -verify misra\misra-test-c11.c.dump || exit /b !errorlevel!
           rem TODO: do we need to verify something here?
           ..\..\cppcheck --dump -DDUMMY --suppress=uninitvar --suppress=uninitStructMember --std=c89 misra\misra-test.h || exit /b !errorlevel!
           ..\..\cppcheck --dump misra\misra-test.cpp || exit /b !errorlevel!

diff --git a/addons/test/misra/misra-test-c11.c b/addons/test/misra/misra-test-c11.c
@@ -0,0 +1,25 @@
+// To test:
+// ~/cppcheck/cppcheck --dump misra/misra-test-c11.c --std=c11
+// ~/cppcheck/cppcheck --dump -DDUMMY --suppress=uninitvar --inline-suppr misra/misra-test-c11.c --std=c11 --platform=unix64 && python3 ../misra.py -verify misra/misra-test-c11.c.dump
+
+#include <stdint.h>
+
+typedef unsigned int UINT_TYPEDEF;
+struct struct_with_bitfields
+{
+  unsigned int a:2; // Compliant
+  signed int   b:2; // Compliant
+  UINT_TYPEDEF c:2; // Compliant
+  int          d:2; // 6.1 - plain int not compliant
+  signed long  f:2; // Compliant in c99 or later - explicitly signed integer type
+  unsigned int g:1; // Compliant
+  signed int   h:1; // 6.2 - signed int with size 1 is not compliant
+  uint16_t     i:1; // Compliant
+  bool         j:1; // Compliant in C99 or later
+};
+
+static void misra6_1_fn(void) {
+    // "Use" occurrence should not generate warnings
+    struct_with_bitfields s;
+    s.h = 61;
+}