Skip to content

Commit 751208d

Browse files
author
Norbert Manthey
committed
tests: drop number of iterations
When checking for success or failure of a test, the number of iterations in the actual test should be irrelevant. As MiniSAT and PicoSAT seem to disagree on this number, do not check for it, so that the testis pass again.
1 parent 12a6917 commit 751208d

File tree

36 files changed

+36
-36
lines changed

36 files changed

+36
-36
lines changed

regression/cbmc-concurrency/pthread_join1/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ main.c
55
^SIGNAL=0$
66
^\[main\.assertion\.1\] assertion i==1: FAILURE$
77
^\[main\.assertion\.2\] assertion i==2: SUCCESS$
8-
^\*\* 1 of 2 failed \(2 iterations\)$
8+
^\*\* 1 of 2 failed
99
--
1010
^warning: ignoring

regression/cbmc-cover/mcdc1/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ main.c
1010
^\[main.coverage.5\] file main.c line 14 function main MC/DC independence condition `C && D && E && !A && B.*: SATISFIED$
1111
^\[main.coverage.6\] file main.c line 14 function main MC/DC independence condition `C && D && E && !A && !B.*: SATISFIED$
1212
^\*\* .* of .* covered \(100.0%\)$
13-
^\*\* Used 10 iterations$
13+
^\*\* Used
1414
--
1515
^warning: ignoring

regression/cbmc-cover/mcdc11/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ main.c
1010
^\[main.coverage.11\] file main.c line 12 function main MC/DC independence condition `!\(C != FALSE\) && D != FALSE.*: SATISFIED$
1111
^\[main.coverage.12\] file main.c line 12 function main MC/DC independence condition `!\(C != FALSE\) && !\(D != FALSE\).*: SATISFIED$
1212
^\*\* .* of .* covered \(100.0%\)$
13-
^\*\* Used 6 iterations$
13+
^\*\* Used
1414
--
1515
^warning: ignoring

regression/cbmc-cover/mcdc12/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ main.c
1313
^\[main.coverage.20\] file main.c line 25 function main MC/DC independence condition `!\(E != FALSE\) && F != FALSE.*: SATISFIED$
1414
^\[main.coverage.21\] file main.c line 25 function main MC/DC independence condition `!\(E != FALSE\) && !\(F != FALSE\).*: SATISFIED$
1515
^\*\* .* of .* covered \(100.0%\)$
16-
^\*\* Used 10 iterations$
16+
^\*\* Used
1717
--
1818
^warning: ignoring

regression/cbmc-cover/mcdc14/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ main.c
66
^\[main.coverage.1\] file main.c line 7 function main decision/condition `altitude > 2500.* SATISFIED$
77
^\[main.coverage.2\] file main.c line 7 function main decision/condition `altitude > 2500.* SATISFIED$
88
^\*\* .* of .* covered \(100.0%\)$
9-
^\*\* Used 2 iterations$
9+
^\*\* Used
1010
--
1111
^warning: ignoring

regression/cbmc-cover/mcdc3/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ main.c
77
^\[main.coverage.2\] file main.c line 8 function main MC/DC independence condition `y < \(unsigned int\)5 && !\(x > \(unsigned int\)3\).*: SATISFIED$
88
^\[main.coverage.3\] file main.c line 8 function main MC/DC independence condition `y < \(unsigned int\)5 && x > \(unsigned int\)3.*: SATISFIED$
99
^\*\* .* of .* covered \(100.0%\)$
10-
^\*\* Used 4 iterations$
10+
^\*\* Used
1111
--
1212
^warning: ignoring

regression/cbmc-cover/mcdc4/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ main.c
99
^\[main.coverage.4\] file main.c line 11 function main MC/DC independence condition `!C && D && A && !B.*: SATISFIED$
1010
^\[main.coverage.5\] file main.c line 11 function main MC/DC independence condition `!A && B && C && !D.*: SATISFIED$
1111
^\*\* .* of .* covered \(100.0%\)$
12-
^\*\* Used 9 iterations$
12+
^\*\* Used
1313
--
1414
^warning: ignoring

regression/cbmc-cover/mcdc6/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ main.c
66
^\[main.coverage.1\] file main.c line 7 function main decision/condition `x < \(unsigned int\)3.* false: SATISFIED$
77
^\[main.coverage.2\] file main.c line 7 function main decision/condition `x < \(unsigned int\)3.* true: SATISFIED$
88
^\*\* .* of .* covered \(100.0%\)$
9-
^\*\* Used 2 iterations$
9+
^\*\* Used
1010
--
1111
^warning: ignoring

regression/cbmc-cover/mcdc7/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ main.c
88
^\[main.coverage.3\] file main.c line 8 function main decision/condition `x \* 123 < 0.* false: SATISFIED$
99
^\[main.coverage.4\] file main.c line 8 function main decision/condition `x \* 123 < 0.* true: SATISFIED$
1010
^\*\* .* of .* covered \(100.0%\)$
11-
^\*\* Used 2 iterations$
11+
^\*\* Used
1212
--
1313
^warning: ignoring

regression/cbmc-cover/mcdc8/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ main.c
88
^\[main.coverage.3\] file main.c line 9 function main MC/DC independence condition `c != FALSE && !\(a != FALSE\) && !\(b != FALSE\).* SATISFIED$
99
^\[main.coverage.4\] file main.c line 9 function main MC/DC independence condition `!\(c != FALSE\) && a != FALSE && !\(b != FALSE\).* SATISFIED$
1010
^\*\* .* of .* covered \(100.0%\)$
11-
^\*\* Used 6 iterations$
11+
^\*\* Used
1212
--
1313
^warning: ignoring

regression/cbmc-cover/mcdc9/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ main.c
99
^\[main.coverage.12\] file main.c line 16 function main MC/DC independence condition `!\(A != FALSE\) && B != FALSE && C != FALSE && !\(D != FALSE\).* SATISFIED$
1010
^\[main.coverage.13\] file main.c line 16 function main MC/DC independence condition `!\(A != FALSE\) && !\(B != FALSE\) && C != FALSE && !\(D != FALSE\).* SATISFIED$
1111
^\*\* .* of .* covered \(100.0%\)$
12-
^\*\* Used 8 iterations$
12+
^\*\* Used
1313
--
1414
^warning: ignoring

regression/cbmc-java/exceptions1/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ test.class
44
^EXIT=10$
55
^SIGNAL=0$
66
^.*assertion at file test.java line 26 function.*: FAILURE$
7-
\*\* 1 of [0-9]* failed \(2 iterations\)$
7+
\*\* 1 of [0-9]* failed
88
^VERIFICATION FAILED$
99
--
1010
^warning: ignoring

regression/cbmc-java/exceptions2/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ test.class
44
^EXIT=10$
55
^SIGNAL=0$
66
^.*assertion at file test.java line 15 function.*: FAILURE$
7-
^\*\* 1 of [0-9]* failed \(2 iterations\)$
7+
^\*\* 1 of [0-9]* failed
88
^VERIFICATION FAILED$
99
--
1010
^warning: ignoring

regression/cbmc-with-incr/Multi_Dimensional_Array6/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ main.c
55
^SIGNAL=0$
66
^\[main\.assertion\.1\] assertion matriz\[\(signed long int\)j\]\[\(signed long int\)k\] <= maior: OK$
77
^\[main\.assertion\.2\] assertion matriz\[\(signed long int\)0\]\[\(signed long int\)0\] < maior: FAILED$
8-
^\*\* 1 of 2 failed \(2 iterations\)$
8+
^\*\* 1 of 2 failed
99
--
1010
^warning: ignoring

regression/cbmc-with-incr/Pointer_byte_extract2/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ main.c
44
^EXIT=10$
55
^SIGNAL=0$
66
^\[main\.assertion\.2\] .*: FAILED$
7-
^\*\* 1 of 2 failed \(2 iterations\)$
7+
^\*\* 1 of 2 failed
88
--
99
^warning: ignoring

regression/cbmc-with-incr/Pointer_byte_extract5/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ main.c
44
^EXIT=10$
55
^SIGNAL=0$
66
^\[main\.array_bounds\.5\] array.List upper bound in .*: FAILED$
7-
^\*\* 1 of 9 failed \(2 iterations\)$
7+
^\*\* 1 of 9 failed
88
--
99
^warning: ignoring

regression/cbmc-with-incr/Pointer_byte_extract8/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ main.c
44
^EXIT=0$
55
^SIGNAL=0$
66
^\[main\.array_bounds\.5\] array.List upper bound: FAILED$
7-
^\*\* 1 of 9 failed \(2 iterations\)$
7+
^\*\* 1 of 9 failed
88
--
99
^warning: ignoring

regression/cbmc-with-incr/pipe1/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ main.c
44
^EXIT=10$
55
^SIGNAL=0$
66
^\[main\.assertion\.4\] assertion data\[1\]==31: FAILED$
7-
^\*\* 1 of 5 failed \(2 iterations\)$
7+
^\*\* 1 of 5 failed
88
--
99
^warning: ignoring

regression/cbmc/Malloc23/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ pointer outside dynamic object bounds in \*p: FAILURE
77
pointer outside dynamic object bounds in \*p: FAILURE
88
pointer outside dynamic object bounds in p2\[.*1\]: FAILURE
99
pointer outside dynamic object bounds in p2\[.*0\]: FAILURE
10-
\*\* 4 of 36 failed \(3 iterations\)
10+
\*\* 4 of 36 failed
1111
--
1212
^warning: ignoring

regression/cbmc/Multi_Dimensional_Array6/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ main.c
55
^SIGNAL=0$
66
^\[main\.assertion\.1\] : SUCCESS$
77
^\[main\.assertion\.2\] : FAILURE$
8-
^\*\* 1 of 2 failed \(2 iterations\)$
8+
^\*\* 1 of 2 failed
99
--
1010
^warning: ignoring

regression/cbmc/Pointer_byte_extract2/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ main.c
44
^EXIT=10$
55
^SIGNAL=0$
66
^\[main\.assertion\.2\] .*: FAILURE$
7-
^\*\* 1 of 2 failed \(2 iterations\)$
7+
^\*\* 1 of 2 failed
88
--
99
^warning: ignoring

regression/cbmc/Pointer_byte_extract5/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ main.c
44
^EXIT=10$
55
^SIGNAL=0$
66
array\.List dynamic object upper bound in p->List\[2\]: FAILURE
7-
\*\* 1 of 11 failed \(2 iterations\)
7+
\*\* 1 of 11 failed
88
--
99
^warning: ignoring

regression/cbmc/Pointer_byte_extract8/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ main.c
44
^EXIT=0$
55
^SIGNAL=0$
66
^\[main\.array_bounds\.5\] array.List upper bound: FAILED$
7-
^\*\* 1 of 9 failed \(2 iterations\)$
7+
^\*\* 1 of 9 failed
88
--
99
^warning: ignoring

regression/cbmc/Quantifiers-assertion/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ main.c
88
^\[main.assertion.4\] NotExists-Forall: failed: FAILURE$
99
^\[main.assertion.5\] NotForall-Forall: successful: SUCCESS$
1010
^\[main.assertion.6\] NotForall-NotForall: successful: SUCCESS$
11-
^\*\* 2 of 6 failed \(2 iterations\)$
11+
^\*\* 2 of 6 failed
1212
^VERIFICATION FAILED$

regression/cbmc/Quantifiers-assignment/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ main.c
66
^\[main.assertion.2\] assertion y: FAILURE$
77
^\[main.assertion.3\] assertion z1: SUCCESS$
88
^\[main.assertion.4\] assertion z2: SUCCESS$
9-
^\*\* 1 of 4 failed \(2 iterations\)$
9+
^\*\* 1 of 4 failed
1010
^VERIFICATION FAILED$

regression/cbmc/Quantifiers-if/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ main.c
77
^\[main.assertion.3\] success 1: SUCCESS$
88
^\[main.assertion.4\] failure 3: FAILURE$
99
^\[main.assertion.5\] success 2: SUCCESS$
10-
^\*\* 3 of 5 failed \(2 iterations\)$
10+
^\*\* 3 of 5 failed
1111
^VERIFICATION FAILED$

regression/cbmc/Quantifiers-initialisation2/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ main.c
77
^\[main.assertion.3\] assertion a\[.*\] > a\[.*\]: FAILURE$
88
^\[main.assertion.4\] forall c\[\]: SUCCESS$
99
^\[main.assertion.5\] assertion c\[.*\] >= c\[.*\]: SUCCESS$
10-
^\*\* 1 of 5 failed \(2 iterations\)$
10+
^\*\* 1 of 5 failed
1111
^VERIFICATION FAILED$

regression/cbmc/Quantifiers-not/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ main.c
77
^\[main.assertion.3\] failure 1: FAILURE$
88
^\[main.assertion.4\] success 3: SUCCESS$
99
^\[main.assertion.5\] failure 2: FAILURE$
10-
^\*\* 2 of 5 failed \(2 iterations\)$
10+
^\*\* 2 of 5 failed
1111
^VERIFICATION FAILED$

regression/cbmc/Quantifiers-type/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ main.c
44
^\*\* Results:$
55
^\[main.assertion.1\] assertion tmp_if_expr\$1: FAILURE$
66
^\[main.assertion.2\] assertion tmp_if_expr\$2: SUCCESS$
7-
^\*\* 1 of 2 failed \(2 iterations\)$
7+
^\*\* 1 of 2 failed
88
^VERIFICATION FAILED$

regression/cbmc/fgets1/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ main.c
55
^SIGNAL=0$
66
^VERIFICATION FAILED$
77
\[main.assertion.3\] assertion p\[1\]=='b': FAILURE
8-
\*\* 1 of \d+ failed \(2 iterations\)
8+
\*\* 1 of \d+ failed
99
--
1010
^warning: ignoring

regression/cbmc/memory_allocation1/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ main.c
77
\[main.assertion.1\] assertion \*p==42: SUCCESS
88
\[main.pointer_dereference.14\] dereference failure: pointer invalid in p\[.*1\]: FAILURE
99
\[main.assertion.2\] assertion \*\(p\+1\)==42: SUCCESS
10-
\*\* 12 of 26 failed \(2 iterations\)
10+
\*\* 12 of 26 failed
1111
--
1212
^warning: ignoring

regression/cbmc/memset1/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ main.c
55
^SIGNAL=0$
66
^VERIFICATION FAILED$
77
\[main.assertion.7\] assertion A\[1\]==0x01010111: FAILURE
8-
\*\* 1 of 12 failed \(2 iterations\)
8+
\*\* 1 of 12 failed
99
--
1010
^warning: ignoring

regression/cbmc/pipe1/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ main.c
44
^EXIT=10$
55
^SIGNAL=0$
66
^\[main\.assertion\.4\] assertion data\[1\]==31: FAILURE$
7-
^\*\* 1 of 5 failed \(2 iterations\)$
7+
^\*\* 1 of 5 failed
88
--
99
^warning: ignoring

regression/cbmc/pointer-function-parameters-2/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ CORE
22
main.c
33
--function fun --cover branch
44
^\*\* 7 of 7 covered \(100.0%\)$
5-
^\*\* Used 4 iterations$
5+
^\*\* Used
66
^Test suite:$
77
^a=\(\(signed int \*\*\)NULL\), tmp\$\d+=[^,]*, tmp\$\d+=[^,]*$
88
^a=&tmp\$\d+!0, tmp\$\d+=\(\(signed int \*\)NULL\), tmp\$\d+=[^,]*$

regression/cbmc/pointer-function-parameters/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ CORE
22
main.c
33
--function fun --cover branch
44
^\*\* 5 of 5 covered \(100\.0%\)$
5-
^\*\* Used 3 iterations$
5+
^\*\* Used
66
^Test suite:$
77
^a=\(\(signed int \*\)NULL\), tmp\$\d+=[^,]*$
88
^a=&tmp\$\d+!0, tmp\$\d+=4$

regression/strings/test_pass1/test.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ test.c
55
^SIGNAL=0$
66
^\[main.assertion.1\] assertion __CPROVER_uninterpreted_string_equal_func\(t, __CPROVER_uninterpreted_string_literal_func\(\"a\"\)): SUCCESS
77
^\[main.assertion.2\] assertion !__CPROVER_uninterpreted_string_equal_func\(t, __CPROVER_uninterpreted_string_literal_func\(\"a\"\)): FAILURE$
8-
^\*\* 1 of 2 failed \(2 iterations\)$
8+
^\*\* 1 of 2 failed

0 commit comments

Comments
 (0)