Skip to content

Commit

Permalink
Adjust proof tooling to support CBMC v6
Browse files Browse the repository at this point in the history
With CBMC v6, unwinding assertions as well as other checks are enabled
by default.
  • Loading branch information
tautschnig committed Aug 23, 2024
1 parent d701079 commit 6799e41
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ jobs:
- name: Set up CBMC runner
uses: FreeRTOS/CI-CD-Github-Actions/set_up_cbmc_runner@main
with:
cbmc_version: "5.95.1"
cbmc_version: "6.1.1"

- env:
stepName: Install Dependencies
Expand Down
6 changes: 3 additions & 3 deletions test/cbmc/proofs/Makefile.template
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,13 @@ goto:
# report if the proof failed. If the proof failed, we separately fail
# the entire job using the check-cbmc-result rule.
cbmc.xml: $(ENTRY).goto
-cbmc $(CBMCFLAGS) $(SOLVER) --unwinding-assertions --trace --xml-ui @RULE_INPUT@ > $@ 2>&1
-cbmc $(CBMCFLAGS) $(SOLVER) --trace --xml-ui @RULE_INPUT@ > $@ 2>&1

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

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

cbmc: cbmc.xml

Expand Down
4 changes: 1 addition & 3 deletions test/cbmc/proofs/MakefileCommon.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@

"CBMCFLAGS ": [
"--object-bits 8",
"--32",
"--bounds-check",
"--pointer-check"
"--32"
],

"FORWARD_SLASH": ["/"],
Expand Down

0 comments on commit 6799e41

Please sign in to comment.