Skip to content

Commit 9b052c2

Browse files
author
thk123
committed
Modified tests to pass without using grep
Now directly test individual lines with perls regex matching rather than calling out to grep. Some changes were required: - escape (, ) if we want to match them - unescape (, ) if we want to use them as regex bracket groups - escape +, $ if we want to use them as actual characters - unescape + to use as a regex +
1 parent ebe4a7f commit 9b052c2

File tree

213 files changed

+306
-306
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

213 files changed

+306
-306
lines changed

regression/ansi-c/struct6/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
CORE
22
main.c
33

4-
^EXIT=\(64\|1\)$
4+
^EXIT=(64|1)$
55
^SIGNAL=0$
66
^main.c:2:1: error: incomplete type not permitted here$
77
^CONVERSION ERROR$

regression/ansi-c/struct7/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
CORE
22
main.c
33

4-
^EXIT=\(64\|1\)$
4+
^EXIT=(64|1)$
55
^SIGNAL=0$
66
^main.c:4:1: error: duplicate member .*$
77
^CONVERSION ERROR$

regression/cbmc-concurrency/constant_prop1/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ main.c
44
^EXIT=0$
55
^SIGNAL=0$
66
^VERIFICATION SUCCESSFUL$
7-
^Generated 1 VCC(s), 0 remaining after simplification$
7+
^Generated 1 VCC\(s\), 0 remaining after simplification$
88
--
99
^warning: ignoring

regression/cbmc-concurrency/pthread_join1/test.desc

Lines changed: 1 addition & 1 deletion
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 \(2 iterations\)$
99
--
1010
^warning: ignoring

regression/cbmc-cover/branch3/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ main.c
33
--cover branch --unwind 6
44
^EXIT=0$
55
^SIGNAL=0$
6-
^\*\* 23 of 23 covered (100.0%)$
6+
^\*\* 23 of 23 covered \(100.0%\)$
77
--
88
^warning: ignoring

regression/cbmc-cover/branch4/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ main.c
33
--cover branch
44
^EXIT=0$
55
^SIGNAL=0$
6-
^\*\* 1 of 1 covered (100.0%)$
6+
^\*\* 1 of 1 covered \(100.0%\)$
77
--
88
^warning: ignoring

regression/cbmc-cover/condition1/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ main.c
1313
^\[main.coverage.8] file main.c line 14 function main condition .* true: SATISFIED
1414
^\[main.coverage.9] file main.c line 16 function main condition .* false: FAILED
1515
^\[main.coverage.10] file main.c line 16 function main condition .* true: SATISFIED
16-
^\*\* 9 of 10 covered (90.0%)
16+
^\*\* 9 of 10 covered \(90.0%\)
1717
--
1818
^warning: ignoring

regression/cbmc-cover/cover1/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ main.c
66
^\[main.coverage.1] file main.c line 8 function main condition .*: SATISFIED$
77
^\[main.coverage.2] file main.c line 9 function main condition .*: SATISFIED$
88
^\[main.coverage.3] file main.c line 13 function main condition .*: FAILED$
9-
^\*\* 2 of 3 covered (66.7%)$
9+
^\*\* 2 of 3 covered \(66.7%\)$
1010
--
1111
^warning: ignoring

regression/cbmc-cover/decision1/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ main.c
33
--cover decision
44
^EXIT=0$
55
^SIGNAL=0$
6-
^\*\* 2 of 2 covered (100.0%)$
6+
^\*\* 2 of 2 covered \(100.0%\)$
77
--
88
^warning: ignoring

regression/cbmc-cover/location1/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ main.c
88
^\[main.coverage.3\] file main.c line 13 function main block 3: SATISFIED$
99
^\[main.coverage.4\] file main.c line 15 function main block 4: FAILED$
1010
^\[main.coverage.5\] file main.c line 17 function main block 5: SATISFIED$
11-
^\*\* 4 of 5 covered (80.0%)
11+
^\*\* 4 of 5 covered \(80.0%\)
1212
--
1313
^warning: ignoring

0 commit comments

Comments
 (0)