Skip to content

Commit 42ffbef

Browse files
committed
Change regression testing suite to support building with cvc4 as well as z3
1 parent d4bfc9c commit 42ffbef

File tree

15 files changed

+26
-16
lines changed

15 files changed

+26
-16
lines changed

regression/cbmc-incr-smt2/CMakeLists.txt

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,16 @@ else()
55
set(exclude_win_broken_tests "")
66
endif()
77

8-
add_test_pl_tests(
9-
"$<TARGET_FILE:cbmc> --validate-goto-model --validate-ssa-equation --slice-formula" ${exclude_win_broken_tests}
8+
add_test_pl_profile(
9+
"cbmc-new-smt-backend-z3"
10+
"$<TARGET_FILE:cbmc> --incremental-smt2-solver 'z3 --smt2 -in' --validate-goto-model --validate-ssa-equation --slice-formula ${exclude_win_broken_tests}"
11+
"-C;-s;new-smt-z3"
12+
"CORE"
13+
)
14+
15+
add_test_pl_profile(
16+
"cbmc-new-smt-backend-cv4"
17+
"$<TARGET_FILE:cbmc> --incremental-smt2-solver 'cvc4 --lang smt' --validate-goto-model --validate-ssa-equation --slice-formula ${exclude_win_broken_tests}"
18+
"-C;-s;new-smt-cvc4"
19+
"CORE"
1020
)

regression/cbmc-incr-smt2/bitvector-arithmetic-operators/overflow_behaviour.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CORE
22
overflow_behaviour.c
3-
--incremental-smt2-solver 'z3 --smt2 -in' --trace
3+
--trace
44
\[main\.assertion\.1\] line \d+ Wrap-around to INT_MIN when adding to INT_MAX: SUCCESS
55
\[main\.assertion\.2\] line \d+ Wrap-around to INT_MAX when subtracting from INT_MIN: SUCCESS
66
\[main\.assertion\.3\] line \d+ INT_MAX minus INT_MIN equals -1: SUCCESS

regression/cbmc-incr-smt2/bitvector-arithmetic-operators/polynomial.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CORE
22
polynomial.c
3-
--incremental-smt2-solver 'z3 --smt2 -in' --trace
3+
--trace
44
\[main\.assertion\.1\] line \d+ No negative solution: FAILURE
55
\[main\.assertion\.2\] line \d+ No positive solution: FAILURE
66
x=-8\ \(11111111 11111111 11111111 11111000\)

regression/cbmc-incr-smt2/bitvector-arithmetic-operators/simple_equation.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CORE
22
simple_equation.c
3-
--incremental-smt2-solver 'z3 --smt2 -in' --trace --verbosity 10
3+
--trace --verbosity 10
44
\[main\.assertion\.1\] line \d+ a plus a always equals two times a: SUCCESS
55
\[main\.assertion\.2\] line \d+ a minus a always equals 0: SUCCESS
66
\[main\.assertion\.3\] line \d+ a plus its additive inverse equals 0: SUCCESS

regression/cbmc-incr-smt2/bitvector-arithmetic-operators/unsigned_behaviour.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CORE
22
unsigned_behaviour.c
3-
--incremental-smt2-solver 'z3 --smt2 -in' --trace
3+
--trace
44
\[main\.assertion\.1\] line \d+ a plus b should be more than 27: FAILURE
55
\[main\.assertion\.2\] line \d+ a plus b should be more than 27: FAILURE
66
\[main\.assertion\.3\] line \d+ c plus d should be more than 27: FAILURE

regression/cbmc-incr-smt2/bitvector-bitwise-operators/bitwise.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CORE
22
bitwise_ops.c
3-
--incremental-smt2-solver 'z3 --smt2 -in' --slice-formula
3+
--slice-formula
44
\[main\.assertion\.1\] line \d+ This is going to fail for bit-opposites: FAILURE
55
\[main\.assertion\.2\] line \d+ This is going to hold for all values != 0: SUCCESS
66
\[main\.assertion\.3\] line \d+ This is going to fail for the same value in A and B: FAILURE

regression/cbmc-incr-smt2/bitvector-bitwise-operators/shift_left.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CORE
22
shift_left.c
3-
--incremental-smt2-solver 'z3 --smt2 -in' --slice-formula
3+
--slice-formula
44
\[main\.assertion\.1\] line \d Shifted result should be greater than one: FAILURE
55
^EXIT=10$
66
^SIGNAL=0$

regression/cbmc-incr-smt2/bitvector-bitwise-operators/shift_right.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CORE
22
shift_right.c
3-
--incremental-smt2-solver 'z3 --smt2 -in' --slice-formula --trace
3+
--slice-formula --trace
44
\[main\.assertion\.1\] line \d+ Right shifting a uint with leftmost bit set is a logical shift: FAILURE
55
\[main\.assertion\.2\] line \d+ Right shifting a positive number has a lower bound of 0: SUCCESS
66
\[main\.assertion\.3\] line \d+ Right shifting a negative number has a lower bound value of -1: SUCCESS

regression/cbmc-incr-smt2/bitvector-flag-tests/div_by_zero.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CORE
22
div_by_zero.c
3-
--incremental-smt2-solver 'z3 --smt2 -in' --div-by-zero-check --trace
3+
--div-by-zero-check --trace
44
\[main\.division-by-zero\.1\] line \d division by zero in x / y: FAILURE
55
\[main\.division-by-zero\.2\] line \d+ division by zero in x / z: SUCCESS
66
y=0

regression/cbmc-incr-smt2/bitvector-flag-tests/signed_overflow.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
KNOWNBUG
22
signed_overflow.c
3-
--incremental-smt2-solver 'z3 --smt2 -in' --signed-overflow-check --trace
3+
--signed-overflow-check --trace
44
^VERIFICATION FAILED$
55
^EXIT=10$
66
^SIGNAL=0$

regression/cbmc-incr-smt2/nondeterministic-int-assert/control_flow.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CORE
22
control_flow.c
3-
--incremental-smt2-solver 'z3 --smt2 -in' --verbosity 10
3+
--verbosity 10
44
Passing problem to incremental SMT2 solving via "z3 --smt2 -in"
55
Sending command to SMT2 solver - \(set-option :produce-models true\)
66
Sending command to SMT2 solver - \(set-logic QF_UFBV\)

regression/cbmc-incr-smt2/nondeterministic-int-assert/incremental_solver_called.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CORE
22
test.c
3-
--incremental-smt2-solver 'z3 --smt2 -in' --verbosity 10
3+
--verbosity 10
44
Passing problem to incremental SMT2 solving via "z3 --smt2 -in"
55
Sending command to SMT2 solver - \(set-option :produce-models true\)
66
Sending command to SMT2 solver - \(set-logic QF_UFBV\)

regression/cbmc-incr-smt2/nondeterministic-int-assert/stdbool.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CORE
22
stdbool_example.c
3-
--incremental-smt2-solver 'z3 --smt2 -in' --trace
3+
--trace
44
Passing problem to incremental SMT2 solving via "z3 --smt2 -in"
55
VERIFICATION FAILED
66
equal=FALSE\s*\([0 ]+\)

regression/cbmc-incr-smt2/nondeterministic-int-assert/trace.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CORE
22
trace.c
3-
--incremental-smt2-solver 'z3 --smt2 -in' --trace
3+
--trace
44
Passing problem to incremental SMT2 solving via "z3 --smt2 -in"
55
Assert of inequality to 4\.: FAILURE
66
Assert of inequality to 2\.: FAILURE

regression/cbmc-incr-smt2/nondeterministic-int-assert/valid_unsat.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CORE
22
valid_unsat.c
3-
--incremental-smt2-solver 'z3 --smt2 -in' --verbosity 10
3+
--verbosity 10
44
Passing problem to incremental SMT2 solving via "z3 --smt2 -in"
55
Sending command to SMT2 solver - \(check-sat\)
66
Solver response - unsat

0 commit comments

Comments
 (0)