Skip to content

Commit 6799e41

Browse files
committed
Adjust proof tooling to support CBMC v6
With CBMC v6, unwinding assertions as well as other checks are enabled by default.
1 parent d701079 commit 6799e41

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ jobs:
406406
- name: Set up CBMC runner
407407
uses: FreeRTOS/CI-CD-Github-Actions/set_up_cbmc_runner@main
408408
with:
409-
cbmc_version: "5.95.1"
409+
cbmc_version: "6.1.1"
410410

411411
- env:
412412
stepName: Install Dependencies

test/cbmc/proofs/Makefile.template

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,13 @@ goto:
124124
# report if the proof failed. If the proof failed, we separately fail
125125
# the entire job using the check-cbmc-result rule.
126126
cbmc.xml: $(ENTRY).goto
127-
-cbmc $(CBMCFLAGS) $(SOLVER) --unwinding-assertions --trace --xml-ui @RULE_INPUT@ > $@ 2>&1
127+
-cbmc $(CBMCFLAGS) $(SOLVER) --trace --xml-ui @RULE_INPUT@ > $@ 2>&1
128128

129129
property.xml: $(ENTRY).goto
130-
cbmc $(CBMCFLAGS) --unwinding-assertions --show-properties --xml-ui @RULE_INPUT@ > $@ 2>&1
130+
cbmc $(CBMCFLAGS) --show-properties --xml-ui @RULE_INPUT@ > $@ 2>&1
131131

132132
coverage.xml: $(ENTRY).goto
133-
cbmc $(CBMCFLAGS) --cover location --xml-ui @RULE_INPUT@ > $@ 2>&1
133+
cbmc $(CBMCFLAGS) --no-standard-checks --malloc-may-fail --malloc-fail-null --cover location --xml-ui @RULE_INPUT@ > $@ 2>&1
134134

135135
cbmc: cbmc.xml
136136

test/cbmc/proofs/MakefileCommon.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@
3232

3333
"CBMCFLAGS ": [
3434
"--object-bits 8",
35-
"--32",
36-
"--bounds-check",
37-
"--pointer-check"
35+
"--32"
3836
],
3937

4038
"FORWARD_SLASH": ["/"],

0 commit comments

Comments
 (0)