Skip to content

Commit 15f44c7

Browse files
Revert "Mark tests which fail due to invariant violations"
This reverts commit d423c65.
1 parent 0d7a943 commit 15f44c7

File tree

16 files changed

+19
-62
lines changed

16 files changed

+19
-62
lines changed
+1-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
KNOWNBUG
1+
CORE
22
main.c
33
--cover mcdc --unwind 5
44
^EXIT=0$
@@ -7,6 +7,3 @@ main.c
77
--
88
^warning: ignoring
99
^\[.*<builtin-library-
10-
--
11-
Knownbug added because this test triggers an invariant in cover.cpp
12-
See #1622 for details

regression/cbmc-cover/mcdc1/test.desc

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
KNOWNBUG
1+
CORE
22
main.c
33
--cover mcdc
44
^EXIT=0$
@@ -12,6 +12,3 @@ main.c
1212
^\*\* .* of .* covered \(100.0%\)$
1313
--
1414
^warning: ignoring
15-
--
16-
Knownbug added because this test triggers an invariant in cover.cpp
17-
See #1622 for details
+1-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
KNOWNBUG
1+
CORE
22
main.c
33
--cover mcdc
44
^EXIT=0$
@@ -10,6 +10,3 @@ main.c
1010
^\*\* .* of .* covered \(100.0%\)$
1111
--
1212
^warning: ignoring
13-
--
14-
Knownbug added because this test triggers an invariant in cover.cpp
15-
See #1622 for details

regression/cbmc-cover/mcdc11/test.desc

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
KNOWNBUG
1+
CORE
22
main.c
33
--cover mcdc
44
^EXIT=0$
@@ -12,6 +12,3 @@ main.c
1212
^\*\* .* of .* covered \(100.0%\)$
1313
--
1414
^warning: ignoring
15-
--
16-
Knownbug added because this test triggers an invariant in cover.cpp
17-
See #1622 for details

regression/cbmc-cover/mcdc12/test.desc

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
KNOWNBUG
1+
CORE
22
main.c
33
--cover mcdc
44
^EXIT=0$
@@ -15,6 +15,3 @@ main.c
1515
^\*\* .* of .* covered \(100.0%\)$
1616
--
1717
^warning: ignoring
18-
--
19-
Knownbug added because this test triggers an invariant in cover.cpp
20-
See #1622 for details
+1-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
KNOWNBUG
1+
CORE
22
main.c
33
--cover mcdc
44
^EXIT=0$
@@ -10,6 +10,3 @@ main.c
1010
^\*\* .* of .* covered \(100.0%\)$
1111
--
1212
^warning: ignoring
13-
--
14-
Knownbug added because this test triggers an invariant in cover.cpp
15-
See #1622 for details
+1-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
KNOWNBUG
1+
CORE
22
main.c
33
--cover mcdc
44
^EXIT=0$
@@ -8,6 +8,3 @@ main.c
88
^\*\* .* of .* covered \(100.0%\)$
99
--
1010
^warning: ignoring
11-
--
12-
Knownbug added because this test triggers an invariant in cover.cpp
13-
See #1622 for details

regression/cbmc-cover/mcdc2/test.desc

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
KNOWNBUG
1+
CORE
22
main.c
33
--cover mcdc
44
^EXIT=0$
@@ -10,6 +10,3 @@ main.c
1010
^\*\* .* of .* covered \(100.0%\)$
1111
--
1212
^warning: ignoring
13-
--
14-
Knownbug added because this test triggers an invariant in cover.cpp
15-
See #1622 for details

regression/cbmc-cover/mcdc3/test.desc

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
KNOWNBUG
1+
CORE
22
main.c
33
--cover mcdc
44
^EXIT=0$
@@ -9,6 +9,3 @@ main.c
99
^\*\* .* of .* covered \(100.0%\)$
1010
--
1111
^warning: ignoring
12-
--
13-
Knownbug added because this test triggers an invariant in cover.cpp
14-
See #1622 for details

regression/cbmc-cover/mcdc4/test.desc

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
KNOWNBUG
1+
CORE
22
main.c
33
--cover mcdc
44
^EXIT=0$
@@ -11,6 +11,3 @@ main.c
1111
^\*\* .* of .* covered \(100.0%\)$
1212
--
1313
^warning: ignoring
14-
--
15-
Knownbug added because this test triggers an invariant in cover.cpp
16-
See #1622 for details

regression/cbmc-cover/mcdc5/test.desc

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
KNOWNBUG
1+
CORE
22
main.c
33
--cover mcdc
44
^EXIT=0$
@@ -11,6 +11,3 @@ main.c
1111
^\*\* .* of .* covered \(100.0%\)$
1212
--
1313
^warning: ignoring
14-
--
15-
Knownbug added because this test triggers an invariant in cover.cpp
16-
See #1622 for details

regression/cbmc-cover/mcdc6/test.desc

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
KNOWNBUG
1+
CORE
22
main.c
33
--cover mcdc
44
^EXIT=0$
@@ -8,6 +8,3 @@ main.c
88
^\*\* .* of .* covered \(100.0%\)$
99
--
1010
^warning: ignoring
11-
--
12-
Knownbug added because this test triggers an invariant in cover.cpp
13-
See #1622 for details

regression/cbmc-cover/mcdc7/test.desc

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
KNOWNBUG
1+
CORE
22
main.c
33
--cover mcdc
44
^EXIT=0$
@@ -10,6 +10,3 @@ main.c
1010
^\*\* .* of .* covered \(100.0%\)$
1111
--
1212
^warning: ignoring
13-
--
14-
Knownbug added because this test triggers an invariant in cover.cpp
15-
See #1622 for details

regression/cbmc-cover/mcdc8/test.desc

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
KNOWNBUG
1+
CORE
22
main.c
33
--cover mcdc
44
^EXIT=0$
@@ -10,6 +10,3 @@ main.c
1010
^\*\* .* of .* covered \(100.0%\)$
1111
--
1212
^warning: ignoring
13-
--
14-
Knownbug added because this test triggers an invariant in cover.cpp
15-
See #1622 for details

regression/cbmc-cover/mcdc9/test.desc

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
KNOWNBUG
1+
CORE
22
main.c
33
--cover mcdc
44
^EXIT=0$
@@ -11,6 +11,3 @@ main.c
1111
^\*\* .* of .* covered \(100.0%\)$
1212
--
1313
^warning: ignoring
14-
--
15-
Knownbug added because this test triggers an invariant in cover.cpp
16-
See #1622 for details

src/goto-instrument/cover_instrument_mcdc.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -706,8 +706,10 @@ void cover_mcdc_instrumentert::instrument(
706706
remove_repetition(controlling);
707707
// for now, we restrict to the case of a single ''decision'';
708708
// however, this is not true, e.g., ''? :'' operator.
709-
INVARIANT(!decisions.empty(), "There must be at least one decision");
710-
minimize_mcdc_controlling(controlling, *decisions.begin());
709+
if(!decisions.empty())
710+
{
711+
minimize_mcdc_controlling(controlling, *decisions.begin());
712+
}
711713

712714
for(const auto &p : controlling)
713715
{

0 commit comments

Comments
 (0)