Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jbmc/regression/jdiff/java-properties/test.desc
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ old.jar --json-ui --show-properties --cover location
activate-multi-line-match
EXIT=0
SIGNAL=0
"deletedFunctions": \[\n \{\n "name": "java::Test.obsolete:\(\)V",\n "properties": \[\n \{\n "class": "coverage",\n "coveredLines": "18",\n "description": "block 1",\n "expression": "false",\n "name": "java::Test.obsolete:\(\)V.coverage.1",\n "sourceLocation": \{\n "bytecodeIndex": "0",\n "file": "Test.java",\n "function": "java::Test.obsolete:\(\)V",\n "line": "18"\n }\n }\n ],\n "sourceLocation": \{\n "file": "Test.java",\n "function": "java::Test.obsolete:\(\)V",\n "line": "18"\n }\n }\n ],\n "modifiedFunctions": \[\n \{\n "name": "java::Test.<init>:\(\)V",\n "properties": \[\n \{\n "class": "coverage",\n "coveredLines": "6",\n "description": "block 2",\n "expression": "false",\n "name": "java::Test.<init>:\(\)V.coverage.1",\n "sourceLocation": \{\n "bytecodeIndex": "1",\n "file": "Test.java",\n "function": "java::Test.<init>:\(\)V",\n "line": "6"\n }\n },\n \{\n "class": "coverage",\n "coveredLines": "4",\n "description": "block 3",\n "expression": "false",\n "name": "java::Test.<init>:\(\)V.coverage.2",\n "sourceLocation": \{\n "bytecodeIndex": "3",\n "file": "Test.java",\n "function": "java::Test.<init>:\(\)V",\n "line": "4"\n }\n },\n \{\n "class": "coverage",\n "coveredLines": "4",\n "description": "block 4",\n "expression": "false",\n "name": "java::Test.<init>:\(\)V.coverage.3",\n "sourceLocation": \{\n "bytecodeIndex": "5",\n "file": "Test.java",\n "function": "java::Test.<init>:\(\)V",\n "line": "4"\n }\n },\n \{\n "class": "coverage",\n "coveredLines": "4",\n "description": "block 5",\n "expression": "false",\n "name": "java::Test.<init>:\(\)V.coverage.4",\n "sourceLocation": \{\n "bytecodeIndex": "6",\n "file": "Test.java",\n "function": "java::Test.<init>:\(\)V",\n "line": "4"\n }\n },\n \{\n "class": "coverage",\n "coveredLines": "7",\n "description": "block 6",\n "expression": "false",\n "name": "java::Test.<init>:\(\)V.coverage.5",\n "sourceLocation": \{\n "bytecodeIndex": "7",\n "file": "Test.java",\n "function": "java::Test.<init>:\(\)V",\n "line": "7"\n }\n }\n ],\n "sourceLocation": \{\n "file": "Test.java",\n "function": "java::Test.<init>:\(\)V",\n "line": "6"\n }\n },\n \{\n "name": "java::Test.<clinit>:\(\)V",\n "properties": \[\n \{\n "class": "coverage",\n "coveredLines": "3",\n "description": "block 1",\n "expression": "false",\n "name": "java::Test.<clinit>:\(\)V.coverage.1",\n "sourceLocation": \{\n "bytecodeIndex": "1",\n "file": "Test.java",\n "function": "java::Test.<clinit>:\(\)V",\n "line": "3"\n }\n }\n ],\n "sourceLocation": \{\n "file": "Test.java",\n "function": "java::Test.<clinit>:\(\)V",\n "line": "3"\n }\n }\n ],\n "newFunctions": \[\n \{\n "name": "java::Test.newfun:\(\)V",\n "properties": \[\n \{\n "class": "coverage",\n "coveredLines": "18",\n "description": "block 1",\n "expression": "false",\n "name": "java::Test.newfun:\(\)V.coverage.1",\n "sourceLocation": \{\n "bytecodeIndex": "0",\n "file": "Test.java",\n "function": "java::Test.newfun:\(\)V",\n "line": "18"\n }\n }\n ],\n "sourceLocation": \{\n "file": "Test.java",\n "function": "java::Test.newfun:\(\)V",\n "line": "18"\n }\n }\n ],\n
"deletedFunctions": \[\n \{\n "name": "java::Test.obsolete:\(\)V",\n "properties": \[\n \{\n "class": "coverage",\n "coveredLines": "18",\n "description": "block 1 \(lines Test.java:java::Test.obsolete:\(\)V:18\)",\n "expression": "false",\n "name": "java::Test.obsolete:\(\)V.coverage.1",\n "sourceLocation": \{\n "bytecodeIndex": "0",\n "file": "Test.java",\n "function": "java::Test.obsolete:\(\)V",\n "line": "18"\n }\n }\n ],\n "sourceLocation": \{\n "file": "Test.java",\n "function": "java::Test.obsolete:\(\)V",\n "line": "18"\n }\n }\n ],\n "modifiedFunctions": \[\n \{\n "name": "java::Test.<init>:\(\)V",\n "properties": \[\n \{\n "class": "coverage",\n "coveredLines": "6",\n "description": "block 2 \(lines Test.java:java::Test.<init>:\(\)V:6\)",\n "expression": "false",\n "name": "java::Test.<init>:\(\)V.coverage.1",\n "sourceLocation": \{\n "bytecodeIndex": "1",\n "file": "Test.java",\n "function": "java::Test.<init>:\(\)V",\n "line": "6"\n }\n },\n \{\n "class": "coverage",\n "coveredLines": "4",\n "description": "block 3 \(lines Test.java:java::Test.<init>:\(\)V:4\)",\n "expression": "false",\n "name": "java::Test.<init>:\(\)V.coverage.2",\n "sourceLocation": \{\n "bytecodeIndex": "3",\n "file": "Test.java",\n "function": "java::Test.<init>:\(\)V",\n "line": "4"\n }\n },\n \{\n "class": "coverage",\n "coveredLines": "4",\n "description": "block 4 \(lines Test.java:java::Test.<init>:\(\)V:4\)",\n "expression": "false",\n "name": "java::Test.<init>:\(\)V.coverage.3",\n "sourceLocation": \{\n "bytecodeIndex": "5",\n "file": "Test.java",\n "function": "java::Test.<init>:\(\)V",\n "line": "4"\n }\n },\n \{\n "class": "coverage",\n "coveredLines": "4",\n "description": "block 5 \(lines Test.java:java::Test.<init>:\(\)V:4\)",\n "expression": "false",\n "name": "java::Test.<init>:\(\)V.coverage.4",\n "sourceLocation": \{\n "bytecodeIndex": "6",\n "file": "Test.java",\n "function": "java::Test.<init>:\(\)V",\n "line": "4"\n }\n },\n \{\n "class": "coverage",\n "coveredLines": "7",\n "description": "block 6 \(lines Test.java:java::Test.<init>:\(\)V:7\)",\n "expression": "false",\n "name": "java::Test.<init>:\(\)V.coverage.5",\n "sourceLocation": \{\n "bytecodeIndex": "7",\n "file": "Test.java",\n "function": "java::Test.<init>:\(\)V",\n "line": "7"\n }\n }\n ],\n "sourceLocation": \{\n "file": "Test.java",\n "function": "java::Test.<init>:\(\)V",\n "line": "6"\n }\n },\n \{\n "name": "java::Test.<clinit>:\(\)V",\n "properties": \[\n \{\n "class": "coverage",\n "coveredLines": "3",\n "description": "block 1 \(lines Test.java:java::Test.<clinit>:\(\)V:3\)",\n "expression": "false",\n "name": "java::Test.<clinit>:\(\)V.coverage.1",\n "sourceLocation": \{\n "bytecodeIndex": "1",\n "file": "Test.java",\n "function": "java::Test.<clinit>:\(\)V",\n "line": "3"\n }\n }\n ],\n "sourceLocation": \{\n "file": "Test.java",\n "function": "java::Test.<clinit>:\(\)V",\n "line": "3"\n }\n }\n ],\n "newFunctions": \[\n \{\n "name": "java::Test.newfun:\(\)V",\n "properties": \[\n \{\n "class": "coverage",\n "coveredLines": "18",\n "description": "block 1 \(lines Test.java:java::Test.newfun:\(\)V:18\)",\n "expression": "false",\n "name": "java::Test.newfun:\(\)V.coverage.1",\n "sourceLocation": \{\n "bytecodeIndex": "0",\n "file": "Test.java",\n "function": "java::Test.newfun:\(\)V",\n "line": "18"\n }\n }\n ],\n "sourceLocation": \{\n "file": "Test.java",\n "function": "java::Test.newfun:\(\)V",\n "line": "18"\n }\n }\n ],\n
--
^warning: ignoring
1 change: 1 addition & 0 deletions jbmc/src/jbmc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ OBJ += ../$(CPROVER_DIR)/src/ansi-c/ansi-c$(LIBEXT) \
../$(CPROVER_DIR)/src/goto-instrument/full_slicer$(OBJEXT) \
../$(CPROVER_DIR)/src/goto-instrument/reachability_slicer$(OBJEXT) \
../$(CPROVER_DIR)/src/goto-instrument/nondet_static$(OBJEXT) \
../$(CPROVER_DIR)/src/goto-instrument/source_lines$(OBJEXT) \
../$(CPROVER_DIR)/src/goto-instrument/cover$(OBJEXT) \
../$(CPROVER_DIR)/src/goto-instrument/cover_basic_blocks$(OBJEXT) \
../$(CPROVER_DIR)/src/goto-instrument/cover_filter$(OBJEXT) \
Expand Down
1 change: 1 addition & 0 deletions jbmc/src/jdiff/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ OBJ += ../$(CPROVER_DIR)/src/ansi-c/ansi-c$(LIBEXT) \
../$(CPROVER_DIR)/src/goto-diff/unified_diff$(OBJEXT) \
../$(CPROVER_DIR)/src/goto-diff/change_impact$(OBJEXT) \
../$(CPROVER_DIR)/src/goto-diff/goto_diff_base$(OBJEXT) \
../$(CPROVER_DIR)/src/goto-instrument/source_lines$(OBJEXT) \
../$(CPROVER_DIR)/src/goto-instrument/cover$(OBJEXT) \
../$(CPROVER_DIR)/src/goto-instrument/cover_basic_blocks$(OBJEXT) \
../$(CPROVER_DIR)/src/goto-instrument/cover_filter$(OBJEXT) \
Expand Down
1 change: 1 addition & 0 deletions jbmc/unit/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ CPROVER_LIBS =../src/java_bytecode/java_bytecode$(LIBEXT) \
$(CPROVER_DIR)/src/goto-checker/goto-checker$(LIBEXT) \
$(CPROVER_DIR)/src/goto-programs/goto-programs$(LIBEXT) \
$(CPROVER_DIR)/src/goto-symex/goto-symex$(LIBEXT) \
$(CPROVER_DIR)/src/goto-instrument/source_lines$(OBJEXT) \
$(CPROVER_DIR)/src/goto-instrument/cover$(OBJEXT) \
$(CPROVER_DIR)/src/goto-instrument/cover_basic_blocks$(OBJEXT) \
$(CPROVER_DIR)/src/goto-instrument/cover_filter$(OBJEXT) \
Expand Down
9 changes: 9 additions & 0 deletions regression/cbmc-cover/block-coverage-report1/main.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
int main()
{
int x;

if(x < 0)
return 0;
else
return 1;
}
9 changes: 9 additions & 0 deletions regression/cbmc-cover/block-coverage-report1/test.desc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
CORE
main.c
--cover location
block 1 \(lines main.c:main:3,5\): SATISFIED
block 2 \(lines main.c:main:6\): SATISFIED
block 3 \(lines main.c:main:6,9\): FAILED
block 4 \(lines main.c:main:8\): SATISFIED
block 5 \(lines main.c:main:9\): SATISFIED
--
25 changes: 25 additions & 0 deletions regression/cbmc-cover/block-coverage-report2/main.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// This is supposed to be testing basic blocks with inlining,
// but cbmc has now turned off inlining by default.

inline int foo(int x)
{
int y;
y = x + 1;
return y;
}

main()
{
int x;
x = 10;
while(x)
{
int y;
y = foo(x);
if(y < 5)
break;
x--;
}

return;
}
12 changes: 12 additions & 0 deletions regression/cbmc-cover/block-coverage-report2/test.desc
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
CORE
main.c
--cover location
block 1 \(lines main.c:main:13,14\): SATISFIED
block 2 \(lines main.c:main:15\): SATISFIED
block 3 \(lines main.c:main:17,18\): SATISFIED
block 4 \(lines main.c:main:18,19\): SATISFIED
block 5 \(lines main.c:main:20\): SATISFIED
block 6 \(lines main.c:main:15,21,22\): SATISFIED
block 7 \(lines main.c:main:24,25\): SATISFIED
block 1 \(lines main.c:foo:6-9\): SATISFIED
--
8 changes: 8 additions & 0 deletions regression/cbmc-cover/block-coverage-report3/main.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
void main()
{
int x = 0;
while(x < 3)
{
x++;
}
}
8 changes: 8 additions & 0 deletions regression/cbmc-cover/block-coverage-report3/test.desc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
CORE
main.c
--cover location --unwind 1
block 1 \(lines main.c:main:3\): SATISFIED
block 2 \(lines main.c:main:4\): SATISFIED
block 3 \(lines main.c:main:4,6\): SATISFIED
block 4 \(lines main.c:main:8\): FAILED
--
8 changes: 8 additions & 0 deletions regression/cbmc-cover/block-coverage-report4/main.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
void main()
{
int x = 0;
while(x < 3)
{
x++;
}
}
8 changes: 8 additions & 0 deletions regression/cbmc-cover/block-coverage-report4/test.desc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
CORE
main.c
--cover location --unwind 4
block 1 \(lines main.c:main:3\): SATISFIED
block 2 \(lines main.c:main:4\): SATISFIED
block 3 \(lines main.c:main:4,6\): SATISFIED
block 4 \(lines main.c:main:8\): SATISFIED
--
10 changes: 5 additions & 5 deletions regression/cbmc-cover/location1/test.desc
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ main.c
--cover location
^EXIT=0$
^SIGNAL=0$
^\[main.coverage.1\] file main.c line 3 function main block 1: SATISFIED$
^\[main.coverage.2\] file main.c line 10 function main block 2: SATISFIED$
^\[main.coverage.3\] file main.c line 13 function main block 3: SATISFIED$
^\[main.coverage.4\] file main.c line 15 function main block 4: FAILED$
^\[main.coverage.5\] file main.c line 17 function main block 5: SATISFIED$
^\[main.coverage.1\] file main.c line 3 function main block 1.*: SATISFIED$
^\[main.coverage.2\] file main.c line 10 function main block 2.*: SATISFIED$
^\[main.coverage.3\] file main.c line 13 function main block 3.*: SATISFIED$
^\[main.coverage.4\] file main.c line 15 function main block 4.*: FAILED$
^\[main.coverage.5\] file main.c line 17 function main block 5.*: SATISFIED$
^\*\* 4 of 5 covered \(80.0%\)
--
^warning: ignoring
18 changes: 9 additions & 9 deletions regression/cbmc-cover/location11/test.desc
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ main.c
--cover location
^EXIT=0$
^SIGNAL=0$
^\[main.coverage.1\] file main.c line 9 function main block 1: SATISFIED$
^\[main.coverage.2\] file main.c line 11 function main block 2: FAILED$
^\[main.coverage.3\] file main.c line 11 function main block 3: FAILED$
^\[main.coverage.4\] file main.c line 13 function main block 4: SATISFIED$
^\[main.coverage.5\] file main.c line 15 function main block 5: SATISFIED$
^\[main.coverage.6\] file main.c line 16 function main block 6: SATISFIED$
^\[main.coverage.7\] file main.c line 18 function main block 7: FAILED$
^\[main.coverage.8\] file main.c line 20 function main block 8: SATISFIED$
^\[myfunc.coverage.1\] file main.c line 3 function myfunc block 1: FAILED$
^\[main.coverage.1\] file main.c line 9 function main block 1.*: SATISFIED$
^\[main.coverage.2\] file main.c line 11 function main block 2.*: FAILED$
^\[main.coverage.3\] file main.c line 11 function main block 3.*: FAILED$
^\[main.coverage.4\] file main.c line 13 function main block 4.*: SATISFIED$
^\[main.coverage.5\] file main.c line 15 function main block 5.*: SATISFIED$
^\[main.coverage.6\] file main.c line 16 function main block 6.*: SATISFIED$
^\[main.coverage.7\] file main.c line 18 function main block 7.*: FAILED$
^\[main.coverage.8\] file main.c line 20 function main block 8.*: SATISFIED$
^\[myfunc.coverage.1\] file main.c line 3 function myfunc block 1.*: FAILED$
^\*\* 5 of 9 covered \(55.6%\)
--
^warning: ignoring
10 changes: 5 additions & 5 deletions regression/cbmc-cover/location12/test.desc
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ main.c
--cover location
^EXIT=0$
^SIGNAL=0$
^\[main.coverage.1\] file main.c line 9 function main block 1: SATISFIED$
^\[main.coverage.2\] file main.c line 10 function main block 2: SATISFIED$
^\[foo.coverage.1\] file main.c line 3 function foo block 1: SATISFIED$
^\[foo.coverage.2\] file main.c line 4 function foo block 2: FAILED$
^\[foo.coverage.3\] file main.c line 5 function foo block 3: SATISFIED$
^\[main.coverage.1\] file main.c line 9 function main block 1.*: SATISFIED$
^\[main.coverage.2\] file main.c line 10 function main block 2.*: SATISFIED$
^\[foo.coverage.1\] file main.c line 3 function foo block 1.*: SATISFIED$
^\[foo.coverage.2\] file main.c line 4 function foo block 2.*: FAILED$
^\[foo.coverage.3\] file main.c line 5 function foo block 3.*: SATISFIED$
^\*\* 4 of 5 covered \(80.0%\)
--
^warning: ignoring
14 changes: 7 additions & 7 deletions regression/cbmc-cover/location13/test.desc
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ main.c
--cover location
^EXIT=0$
^SIGNAL=0$
^\[main.coverage.1\] file main.c line 14 function main block 1: SATISFIED$
^\[main.coverage.2\] file main.c line 15 function main block 2: SATISFIED$
^\[myfunc.coverage.1\] file main.c line 3 function myfunc block 1: FAILED$
^\[foo.coverage.1\] file main.c line 8 function foo block 1: SATISFIED$
^\[foo.coverage.2\] file main.c line 9 function foo block 2: FAILED$
^\[foo.coverage.3\] file main.c line 10 function foo block 3: FAILED$
^\[foo.coverage.4\] file main.c line 10 function foo block 4: SATISFIED$
^\[main.coverage.1\] file main.c line 14 function main block 1.*: SATISFIED$
^\[main.coverage.2\] file main.c line 15 function main block 2.*: SATISFIED$
^\[myfunc.coverage.1\] file main.c line 3 function myfunc block 1.*: FAILED$
^\[foo.coverage.1\] file main.c line 8 function foo block 1.*: SATISFIED$
^\[foo.coverage.2\] file main.c line 9 function foo block 2.*: FAILED$
^\[foo.coverage.3\] file main.c line 10 function foo block 3.*: FAILED$
^\[foo.coverage.4\] file main.c line 10 function foo block 4.*: SATISFIED$
^\*\* 4 of 7 covered \(57.1%\)
--
^warning: ignoring
10 changes: 5 additions & 5 deletions regression/cbmc-cover/location14/test.desc
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ main.c
--cover location
^EXIT=0$
^SIGNAL=0$
^\[main.coverage.1\] file main.c line 8 function main block 1: SATISFIED$
^\[main.coverage.2\] file main.c line 12 function main block 2: FAILED$
^\[main.coverage.3\] file main.c line 12 function main block 3: FAILED$
^\[main.coverage.4\] file main.c line 13 function main block 4: SATISFIED$
^\[foo.coverage.1\] file main.c line 3 function foo block 1: FAILED$
^\[main.coverage.1\] file main.c line 8 function main block 1.*: SATISFIED$
^\[main.coverage.2\] file main.c line 12 function main block 2.*: FAILED$
^\[main.coverage.3\] file main.c line 12 function main block 3.*: FAILED$
^\[main.coverage.4\] file main.c line 13 function main block 4.*: SATISFIED$
^\[foo.coverage.1\] file main.c line 3 function foo block 1.*: FAILED$
^\*\* 2 of 5 covered \(40.0%\)
--
^warning: ignoring
10 changes: 5 additions & 5 deletions regression/cbmc-cover/location15/test.desc
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ main.c
--cover location
^EXIT=0$
^SIGNAL=0$
^\[main.coverage.1\] file main.c line 10 function main block 1: SATISFIED$
^\[main.coverage.2\] file main.c line 11 function main block 2: SATISFIED$
^\[main.coverage.3\] file main.c line 13 function main block 3: FAILED$
^\[main.coverage.4\] file main.c line 16 function main block 4: SATISFIED$
^\[foo.coverage.1\] file main.c line 5 function foo block 1: FAILED$
^\[main.coverage.1\] file main.c line 10 function main block 1.*: SATISFIED$
^\[main.coverage.2\] file main.c line 11 function main block 2.*: SATISFIED$
^\[main.coverage.3\] file main.c line 13 function main block 3.*: FAILED$
^\[main.coverage.4\] file main.c line 16 function main block 4.*: SATISFIED$
^\[foo.coverage.1\] file main.c line 5 function foo block 1.*: FAILED$
^\*\* 3 of 5 covered \(60.0%\)
--
^warning: ignoring
14 changes: 7 additions & 7 deletions regression/cbmc-cover/location16/test.desc
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ main.c
--cover location
^EXIT=0$
^SIGNAL=0$
^\[main.coverage.1\] file main.c line 19 function main block 1: SATISFIED$
^\[main.coverage.2\] file main.c line 20 function main block 2: SATISFIED$
^\[func.coverage.1\] file main.c line 3 function func block 1: SATISFIED$
^\[func.coverage.2\] file main.c line 6 function func block 2: FAILED$
^\[func.coverage.3\] file main.c line 8 function func block 3: FAILED$
^\[func.coverage.4\] file main.c line 12 function func block 4: FAILED$
^\[func.coverage.5\] file main.c line 15 function func block 5: SATISFIED$
^\[main.coverage.1\] file main.c line 19 function main block 1.*: SATISFIED$
^\[main.coverage.2\] file main.c line 20 function main block 2.*: SATISFIED$
^\[func.coverage.1\] file main.c line 3 function func block 1.*: SATISFIED$
^\[func.coverage.2\] file main.c line 6 function func block 2.*: FAILED$
^\[func.coverage.3\] file main.c line 8 function func block 3.*: FAILED$
^\[func.coverage.4\] file main.c line 12 function func block 4.*: FAILED$
^\[func.coverage.5\] file main.c line 15 function func block 5.*: SATISFIED$
^\*\* 4 of 7 covered \(57.1%\)
--
^warning: ignoring
Loading