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 +

Author: thk123

regression/ansi-c/struct6/test.desc

@@ -1,7 +1,7 @@
 CORE
 main.c
 
-^EXIT=\(64\|1\)$
+^EXIT=(64|1)$
 ^SIGNAL=0$
 ^main.c:2:1: error: incomplete type not permitted here$
 ^CONVERSION ERROR$

regression/ansi-c/struct7/test.desc

@@ -1,7 +1,7 @@
 CORE
 main.c
 
-^EXIT=\(64\|1\)$
+^EXIT=(64|1)$
 ^SIGNAL=0$
 ^main.c:4:1: error: duplicate member .*$
 ^CONVERSION ERROR$

regression/cbmc-concurrency/constant_prop1/test.desc

@@ -4,6 +4,6 @@ main.c
 ^EXIT=0$
 ^SIGNAL=0$
 ^VERIFICATION SUCCESSFUL$
-^Generated 1 VCC(s), 0 remaining after simplification$
+^Generated 1 VCC\(s\), 0 remaining after simplification$
 --
 ^warning: ignoring

regression/cbmc-concurrency/pthread_join1/test.desc

@@ -5,6 +5,6 @@ main.c
 ^SIGNAL=0$
 ^\[main\.assertion\.1\] assertion i==1: FAILURE$
 ^\[main\.assertion\.2\] assertion i==2: SUCCESS$
-^\*\* 1 of 2 failed (2 iterations)$
+^\*\* 1 of 2 failed \(2 iterations\)$
 --
 ^warning: ignoring

regression/cbmc-cover/branch3/test.desc

@@ -3,6 +3,6 @@ main.c
 --cover branch --unwind 6
 ^EXIT=0$
 ^SIGNAL=0$
-^\*\* 23 of 23 covered (100.0%)$
+^\*\* 23 of 23 covered \(100.0%\)$
 --
 ^warning: ignoring

regression/cbmc-cover/branch4/test.desc

@@ -3,6 +3,6 @@ main.c
 --cover branch
 ^EXIT=0$
 ^SIGNAL=0$
-^\*\* 1 of 1 covered (100.0%)$
+^\*\* 1 of 1 covered \(100.0%\)$
 --
 ^warning: ignoring

regression/cbmc-cover/condition1/test.desc

@@ -13,6 +13,6 @@ main.c
 ^\[main.coverage.8] file main.c line 14 function main condition .* true: SATISFIED
 ^\[main.coverage.9] file main.c line 16 function main condition .* false: FAILED
 ^\[main.coverage.10] file main.c line 16 function main condition .* true: SATISFIED
-^\*\* 9 of 10 covered (90.0%)
+^\*\* 9 of 10 covered \(90.0%\)
 --
 ^warning: ignoring

regression/cbmc-cover/cover1/test.desc

@@ -6,6 +6,6 @@ main.c
 ^\[main.coverage.1] file main.c line 8 function main condition .*: SATISFIED$
 ^\[main.coverage.2] file main.c line 9 function main condition .*: SATISFIED$
 ^\[main.coverage.3] file main.c line 13 function main condition .*: FAILED$
-^\*\* 2 of 3 covered (66.7%)$
+^\*\* 2 of 3 covered \(66.7%\)$
 --
 ^warning: ignoring

regression/cbmc-cover/decision1/test.desc

@@ -3,6 +3,6 @@ main.c
 --cover decision
 ^EXIT=0$
 ^SIGNAL=0$
-^\*\* 2 of 2 covered (100.0%)$
+^\*\* 2 of 2 covered \(100.0%\)$
 --
 ^warning: ignoring

regression/cbmc-cover/location1/test.desc

@@ -8,6 +8,6 @@ main.c
 ^\[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%)
+^\*\* 4 of 5 covered \(80.0%\)
 --
 ^warning: ignoring

regression/cbmc-cover/location11/test.desc

@@ -14,6 +14,6 @@ main.c
 ^\[main.coverage.9\] file main.c line 23 function main block 10: SATISFIED$
 ^\[myfunc.coverage.1\] file main.c line 5 function myfunc block 1: FAILED$
 ^\[myfunc.coverage.2\] file main.c line 7 function myfunc block 2: FAILED$
-^\*\* 6 of 11 covered (54.5%)
+^\*\* 6 of 11 covered \(54.5%\)
 --
 ^warning: ignoring

regression/cbmc-cover/location12/test.desc

@@ -10,6 +10,6 @@ main.c
 ^\[foo.coverage.2\] file main.c line 6 function foo block 2: FAILED$
 ^\[foo.coverage.3\] file main.c line 7 function foo block 3: FAILED$
 ^\[foo.coverage.4\] file main.c line 7 function foo block 4: SATISFIED$
-^\*\* 5 of 7 covered (71.4%)
+^\*\* 5 of 7 covered \(71.4%\)
 --
 ^warning: ignoring

regression/cbmc-cover/location13/test.desc

@@ -13,6 +13,6 @@ main.c
 ^\[foo.coverage.3\] file main.c line 11 function foo block 3: FAILED$
 ^\[foo.coverage.4\] file main.c line 12 function foo block 4: FAILED$
 ^\[foo.coverage.5\] file main.c line 12 function foo block 5: SATISFIED$
-^\*\* 5 of 10 covered (50.0%)
+^\*\* 5 of 10 covered \(50.0%\)
 --
 ^warning: ignoring

regression/cbmc-cover/location14/test.desc

@@ -9,6 +9,6 @@ main.c
 ^\[main.coverage.4\] file main.c line 13 function main block 4: SATISFIED$
 ^\[foo.coverage.1\] file main.c line 5 function foo block 1: FAILED$
 ^\[foo.coverage.2\] file main.c line 6 function foo block 2: FAILED$
-^\*\* 2 of 6 covered (33.3%)
+^\*\* 2 of 6 covered \(33.3%\)
 --
 ^warning: ignoring

regression/cbmc-cover/location15/test.desc

@@ -12,6 +12,6 @@ main.c
 ^\[main.coverage.7\] file main.c line 17 function main block 7: SATISFIED$
 ^\[foo.coverage.1\] file main.c line 6 function foo block 1: FAILED$
 ^\[foo.coverage.2\] file main.c line 7 function foo block 2: FAILED$
-^\*\* 3 of 9 covered (33.3%)
+^\*\* 3 of 9 covered \(33.3%\)
 --
 ^warning: ignoring

regression/cbmc-cover/location16/test.desc

@@ -12,6 +12,6 @@ main.c
 ^\[func.coverage.5\] file main.c line 13 function func block 5: FAILED$
 ^\[func.coverage.6\] file main.c line 15 function func block 6: FAILED$
 ^\[func.coverage.7\] file main.c line 16 function func block 7: SATISFIED$
-^\*\* 4 of 9 covered (44.4%)
+^\*\* 4 of 9 covered \(44.4%\)
 --
 ^warning: ignoring

regression/cbmc-cover/mcdc1/test.desc

@@ -9,7 +9,7 @@ main.c
 ^\[main.coverage.4\] file main.c line 14 function main MC/DC independence condition `C && D && E && A && !B.*: SATISFIED$
 ^\[main.coverage.5\] file main.c line 14 function main MC/DC independence condition `C && D && E && !A && B.*: SATISFIED$
 ^\[main.coverage.6\] file main.c line 14 function main MC/DC independence condition `C && D && E && !A && !B.*: SATISFIED$
-^\*\* .* of .* covered (100.0%)$
+^\*\* .* of .* covered \(100.0%\)$
 ^\*\* Used 10 iterations$
 --
 ^warning: ignoring

regression/cbmc-cover/mcdc10/test.desc

@@ -3,11 +3,11 @@ main.c
 --cover mcdc
 ^EXIT=0$
 ^SIGNAL=0$
-^\[main.coverage.1\] file main.c line 9 function main MC/DC independence condition `A != FALSE && !(B != FALSE) && !(C != FALSE).*: SATISFIED$
-^\[main.coverage.2\] file main.c line 9 function main MC/DC independence condition `!(A != FALSE) && B != FALSE && !(C != FALSE).*: SATISFIED$
-^\[main.coverage.3\] file main.c line 9 function main MC/DC independence condition `!(A != FALSE) && !(B != FALSE) && C != FALSE.*: SATISFIED$
-^\[main.coverage.4\] file main.c line 9 function main MC/DC independence condition `!(A != FALSE) && !(B != FALSE) && !(C != FALSE).*: SATISFIED$
-^\*\* .* of .* covered (100.0%)$
+^\[main.coverage.1\] file main.c line 9 function main MC/DC independence condition `A != FALSE && !\(B != FALSE\) && !\(C != FALSE\).*: SATISFIED$
+^\[main.coverage.2\] file main.c line 9 function main MC/DC independence condition `!\(A != FALSE\) && B != FALSE && !\(C != FALSE\).*: SATISFIED$
+^\[main.coverage.3\] file main.c line 9 function main MC/DC independence condition `!\(A != FALSE\) && !\(B != FALSE\) && C != FALSE.*: SATISFIED$
+^\[main.coverage.4\] file main.c line 9 function main MC/DC independence condition `!\(A != FALSE\) && !\(B != FALSE\) && !\(C != FALSE\).*: SATISFIED$
+^\*\* .* of .* covered \(100.0%\)$
 ^\*\* Used 5 iterations$
 --
 ^warning: ignoring

regression/cbmc-cover/mcdc11/test.desc

@@ -4,12 +4,12 @@ main.c
 ^EXIT=0$
 ^SIGNAL=0$
 ^\[main.coverage.1\] file main.c line 10 function main MC/DC independence condition `A != FALSE && B != FALSE.*: SATISFIED$
-^\[main.coverage.2\] file main.c line 10 function main MC/DC independence condition `A != FALSE && !(B != FALSE).*: SATISFIED$
-^\[main.coverage.3\] file main.c line 10 function main MC/DC independence condition `!(A != FALSE) && B != FALSE.*: SATISFIED$
-^\[main.coverage.10\] file main.c line 12 function main MC/DC independence condition `C != FALSE && !(D != FALSE).*: SATISFIED$
-^\[main.coverage.11\] file main.c line 12 function main MC/DC independence condition `!(C != FALSE) && D != FALSE.*: SATISFIED$
-^\[main.coverage.12\] file main.c line 12 function main MC/DC independence condition `!(C != FALSE) && !(D != FALSE).*: SATISFIED$
-^\*\* .* of .* covered (100.0%)$
+^\[main.coverage.2\] file main.c line 10 function main MC/DC independence condition `A != FALSE && !\(B != FALSE\).*: SATISFIED$
+^\[main.coverage.3\] file main.c line 10 function main MC/DC independence condition `!\(A != FALSE\) && B != FALSE.*: SATISFIED$
+^\[main.coverage.10\] file main.c line 12 function main MC/DC independence condition `C != FALSE && !\(D != FALSE\).*: SATISFIED$
+^\[main.coverage.11\] file main.c line 12 function main MC/DC independence condition `!\(C != FALSE\) && D != FALSE.*: SATISFIED$
+^\[main.coverage.12\] file main.c line 12 function main MC/DC independence condition `!\(C != FALSE\) && !\(D != FALSE\).*: SATISFIED$
+^\*\* .* of .* covered \(100.0%\)$
 ^\*\* Used 6 iterations$
 --
 ^warning: ignoring

regression/cbmc-cover/mcdc12/test.desc

@@ -4,15 +4,15 @@ main.c
 ^EXIT=0$
 ^SIGNAL=0$
 ^\[main.coverage.1\] file main.c line 12 function main MC/DC independence condition `A != FALSE && B != FALSE.*: SATISFIED$
-^\[main.coverage.2\] file main.c line 12 function main MC/DC independence condition `A != FALSE && !(B != FALSE).*: SATISFIED$
-^\[main.coverage.3\] file main.c line 12 function main MC/DC independence condition `!(A != FALSE) && B != FALSE.*: SATISFIED$
-^\[main.coverage.10\] file main.c line 14 function main MC/DC independence condition `C != FALSE && !(D != FALSE).*: SATISFIED$
-^\[main.coverage.11\] file main.c line 14 function main MC/DC independence condition `!(C != FALSE) && D != FALSE.*: SATISFIED$
-^\[main.coverage.12\] file main.c line 14 function main MC/DC independence condition `!(C != FALSE) && !(D != FALSE).*: SATISFIED$
-^\[main.coverage.19\] file main.c line 25 function main MC/DC independence condition `E != FALSE && !(F != FALSE).*: SATISFIED$
-^\[main.coverage.20\] file main.c line 25 function main MC/DC independence condition `!(E != FALSE) && F != FALSE.*: SATISFIED$
-^\[main.coverage.21\] file main.c line 25 function main MC/DC independence condition `!(E != FALSE) && !(F != FALSE).*: SATISFIED$
-^\*\* .* of .* covered (100.0%)$
+^\[main.coverage.2\] file main.c line 12 function main MC/DC independence condition `A != FALSE && !\(B != FALSE\).*: SATISFIED$
+^\[main.coverage.3\] file main.c line 12 function main MC/DC independence condition `!\(A != FALSE\) && B != FALSE.*: SATISFIED$
+^\[main.coverage.10\] file main.c line 14 function main MC/DC independence condition `C != FALSE && !\(D != FALSE\).*: SATISFIED$
+^\[main.coverage.11\] file main.c line 14 function main MC/DC independence condition `!\(C != FALSE\) && D != FALSE.*: SATISFIED$
+^\[main.coverage.12\] file main.c line 14 function main MC/DC independence condition `!\(C != FALSE\) && !\(D != FALSE\).*: SATISFIED$
+^\[main.coverage.19\] file main.c line 25 function main MC/DC independence condition `E != FALSE && !\(F != FALSE\).*: SATISFIED$
+^\[main.coverage.20\] file main.c line 25 function main MC/DC independence condition `!\(E != FALSE\) && F != FALSE.*: SATISFIED$
+^\[main.coverage.21\] file main.c line 25 function main MC/DC independence condition `!\(E != FALSE\) && !\(F != FALSE\).*: SATISFIED$
+^\*\* .* of .* covered \(100.0%\)$
 ^\*\* Used 10 iterations$
 --
 ^warning: ignoring

regression/cbmc-cover/mcdc13/test.desc

@@ -4,10 +4,10 @@ main.c
 ^EXIT=0$
 ^SIGNAL=0$
 ^\[main.coverage.1\] file main.c line 9 function main MC/DC independence condition `A != FALSE && B != FALSE && C != FALSE.* SATISFIED$
-^\[main.coverage.2\] file main.c line 9 function main MC/DC independence condition `A != FALSE && B != FALSE && !(C != FALSE).* SATISFIED$
-^\[main.coverage.3\] file main.c line 9 function main MC/DC independence condition `A != FALSE && !(B != FALSE) && C != FALSE.* SATISFIED$
-^\[main.coverage.4\] file main.c line 9 function main MC/DC independence condition `!(A != FALSE) && B != FALSE && C != FALSE.* SATISFIED$
-^\*\* .* of .* covered (100.0%)$
+^\[main.coverage.2\] file main.c line 9 function main MC/DC independence condition `A != FALSE && B != FALSE && !\(C != FALSE\).* SATISFIED$
+^\[main.coverage.3\] file main.c line 9 function main MC/DC independence condition `A != FALSE && !\(B != FALSE\) && C != FALSE.* SATISFIED$
+^\[main.coverage.4\] file main.c line 9 function main MC/DC independence condition `!\(A != FALSE\) && B != FALSE && C != FALSE.* SATISFIED$
+^\*\* .* of .* covered \(100.0%\)$
 ^\*\* Used 6 iterations$
 --
 ^warning: ignoring

regression/cbmc-cover/mcdc14/test.desc

@@ -5,7 +5,7 @@ main.c
 ^SIGNAL=0$
 ^\[main.coverage.1\] file main.c line 7 function main decision/condition `altitude > 2500.* SATISFIED$
 ^\[main.coverage.2\] file main.c line 7 function main decision/condition `altitude > 2500.* SATISFIED$
-^\*\* .* of .* covered (100.0%)$
+^\*\* .* of .* covered \(100.0%\)$
 ^\*\* Used 2 iterations$
 --
 ^warning: ignoring

regression/cbmc-cover/mcdc2/test.desc

@@ -7,7 +7,7 @@ main.c
 ^\[main.coverage.2\] file main.c line 10 function main MC/DC independence condition `!A && B && !C.*: SATISFIED$
 ^\[main.coverage.3\] file main.c line 10 function main MC/DC independence condition `!A && !B && C.*: SATISFIED$
 ^\[main.coverage.4\] file main.c line 10 function main MC/DC independence condition `!A && !B && !C.*: SATISFIED$
-^\*\* .* of .* covered (100.0%)$
+^\*\* .* of .* covered \(100.0%\)$
 ^\*\* Used 6 iterations$
 --
 ^warning: ignoring

regression/cbmc-cover/mcdc3/test.desc

@@ -3,10 +3,10 @@ main.c
 --cover mcdc
 ^EXIT=0$
 ^SIGNAL=0$
-^\[main.coverage.1\] file main.c line 8 function main MC/DC independence condition `!(x > (unsigned int)3) && !(y < (unsigned int)5).*: SATISFIED$
-^\[main.coverage.2\] file main.c line 8 function main MC/DC independence condition `y < (unsigned int)5 && !(x > (unsigned int)3).*: SATISFIED$
-^\[main.coverage.3\] file main.c line 8 function main MC/DC independence condition `y < (unsigned int)5 && x > (unsigned int)3.*: SATISFIED$
-^\*\* .* of .* covered (100.0%)$
+^\[main.coverage.1\] file main.c line 8 function main MC/DC independence condition `!\(x > \(unsigned int\)3\) && !\(y < \(unsigned int\)5\).*: SATISFIED$
+^\[main.coverage.2\] file main.c line 8 function main MC/DC independence condition `y < \(unsigned int\)5 && !\(x > \(unsigned int\)3\).*: SATISFIED$
+^\[main.coverage.3\] file main.c line 8 function main MC/DC independence condition `y < \(unsigned int\)5 && x > \(unsigned int\)3.*: SATISFIED$
+^\*\* .* of .* covered \(100.0%\)$
 ^\*\* Used 4 iterations$
 --
 ^warning: ignoring

regression/cbmc-cover/mcdc4/test.desc

@@ -8,7 +8,7 @@ main.c
 ^\[main.coverage.3\] file main.c line 11 function main MC/DC independence condition `A && !B && C && !D.*: SATISFIED$
 ^\[main.coverage.4\] file main.c line 11 function main MC/DC independence condition `!C && D && A && !B.*: SATISFIED$
 ^\[main.coverage.5\] file main.c line 11 function main MC/DC independence condition `!A && B && C && !D.*: SATISFIED$
-^\*\* .* of .* covered (100.0%)$
+^\*\* .* of .* covered \(100.0%\)$
 ^\*\* Used 9 iterations$
 --
 ^warning: ignoring

regression/cbmc-cover/mcdc5/test.desc

@@ -8,7 +8,7 @@ main.c
 ^\[main.coverage.3\] file main.c line 10 function main MC/DC independence condition `!C && !D && A && !B.*: SATISFIED$
 ^\[main.coverage.4\] file main.c line 10 function main MC/DC independence condition `!A && B && C && !D.*: SATISFIED$
 ^\[main.coverage.5\] file main.c line 10 function main MC/DC independence condition `!A && !B && C && !D.*: SATISFIED$
-^\*\* .* of .* covered (100.0%)$
+^\*\* .* of .* covered \(100.0%\)$
 ^\*\* Used 9 iterations$
 --
 ^warning: ignoring

regression/cbmc-cover/mcdc6/test.desc

@@ -3,9 +3,9 @@ main.c
 --cover mcdc
 ^EXIT=0$
 ^SIGNAL=0$
-^\[main.coverage.1\] file main.c line 7 function main decision/condition `x < (unsigned int)3.* false: SATISFIED$
-^\[main.coverage.2\] file main.c line 7 function main decision/condition `x < (unsigned int)3.* true: SATISFIED$
-^\*\* .* of .* covered (100.0%)$
+^\[main.coverage.1\] file main.c line 7 function main decision/condition `x < \(unsigned int\)3.* false: SATISFIED$
+^\[main.coverage.2\] file main.c line 7 function main decision/condition `x < \(unsigned int\)3.* true: SATISFIED$
+^\*\* .* of .* covered \(100.0%\)$
 ^\*\* Used 2 iterations$
 --
 ^warning: ignoring

regression/cbmc-cover/mcdc7/test.desc

@@ -7,7 +7,7 @@ main.c
 ^\[main.coverage.2\] file main.c line 8 function main decision/condition `x \* 123 > 100.* true: SATISFIED$
 ^\[main.coverage.3\] file main.c line 8 function main decision/condition `x \* 123 < 0.* false: SATISFIED$
 ^\[main.coverage.4\] file main.c line 8 function main decision/condition `x \* 123 < 0.* true: SATISFIED$
-^\*\* .* of .* covered (100.0%)$
+^\*\* .* of .* covered \(100.0%\)$
 ^\*\* Used 2 iterations$
 --
 ^warning: ignoring

regression/cbmc-cover/mcdc8/test.desc

@@ -3,11 +3,11 @@ main.c
 --cover mcdc
 ^EXIT=0$
 ^SIGNAL=0$
-^\[main.coverage.1\] file main.c line 9 function main MC/DC independence condition `c != FALSE && a != FALSE && !(b != FALSE).* SATISFIED$
-^\[main.coverage.2\] file main.c line 9 function main MC/DC independence condition `c != FALSE && !(a != FALSE) && b != FALSE.* SATISFIED$
-^\[main.coverage.3\] file main.c line 9 function main MC/DC independence condition `c != FALSE && !(a != FALSE) && !(b != FALSE).* SATISFIED$
-^\[main.coverage.4\] file main.c line 9 function main MC/DC independence condition `!(c != FALSE) && a != FALSE && !(b != FALSE).* SATISFIED$
-^\*\* .* of .* covered (100.0%)$
+^\[main.coverage.1\] file main.c line 9 function main MC/DC independence condition `c != FALSE && a != FALSE && !\(b != FALSE\).* SATISFIED$
+^\[main.coverage.2\] file main.c line 9 function main MC/DC independence condition `c != FALSE && !\(a != FALSE\) && b != FALSE.* SATISFIED$
+^\[main.coverage.3\] file main.c line 9 function main MC/DC independence condition `c != FALSE && !\(a != FALSE\) && !\(b != FALSE\).* SATISFIED$
+^\[main.coverage.4\] file main.c line 9 function main MC/DC independence condition `!\(c != FALSE\) && a != FALSE && !\(b != FALSE\).* SATISFIED$
+^\*\* .* of .* covered \(100.0%\)$
 ^\*\* Used 6 iterations$
 --
 ^warning: ignoring

regression/cbmc-cover/mcdc9/test.desc

@@ -3,12 +3,12 @@ main.c
 --cover mcdc
 ^EXIT=0$
 ^SIGNAL=0$
-^\[main.coverage.9\] file main.c line 16 function main MC/DC independence condition `A != FALSE && !(B != FALSE) && C != FALSE && !(D != FALSE).* SATISFIED$
-^\[main.coverage.10\] file main.c line 16 function main MC/DC independence condition `!(C != FALSE) && D != FALSE && A != FALSE && !(B != FALSE).* SATISFIED$
-^\[main.coverage.11\] file main.c line 16 function main MC/DC independence condition `!(C != FALSE) && !(D != FALSE) && A != FALSE && !(B != FALSE).* SATISFIED$
-^\[main.coverage.12\] file main.c line 16 function main MC/DC independence condition `!(A != FALSE) && B != FALSE && C != FALSE && !(D != FALSE).* SATISFIED$
-^\[main.coverage.13\] file main.c line 16 function main MC/DC independence condition `!(A != FALSE) && !(B != FALSE) && C != FALSE && !(D != FALSE).* SATISFIED$
-^\*\* .* of .* covered (100.0%)$
+^\[main.coverage.9\] file main.c line 16 function main MC/DC independence condition `A != FALSE && !\(B != FALSE\) && C != FALSE && !\(D != FALSE\).* SATISFIED$
+^\[main.coverage.10\] file main.c line 16 function main MC/DC independence condition `!\(C != FALSE\) && D != FALSE && A != FALSE && !\(B != FALSE\).* SATISFIED$
+^\[main.coverage.11\] file main.c line 16 function main MC/DC independence condition `!\(C != FALSE\) && !\(D != FALSE\) && A != FALSE && !\(B != FALSE\).* SATISFIED$
+^\[main.coverage.12\] file main.c line 16 function main MC/DC independence condition `!\(A != FALSE\) && B != FALSE && C != FALSE && !\(D != FALSE\).* SATISFIED$
+^\[main.coverage.13\] file main.c line 16 function main MC/DC independence condition `!\(A != FALSE\) && !\(B != FALSE\) && C != FALSE && !\(D != FALSE\).* SATISFIED$
+^\*\* .* of .* covered \(100.0%\)$
 ^\*\* Used 8 iterations$
 --
 ^warning: ignoring

regression/cbmc-java/LocalVarTable2/test.desc

@@ -4,4 +4,4 @@ LocalVarTable2.class
 ^EXIT=0$
 ^SIGNAL=0$
 --
-return_value.*(void \*)i
+return_value.*\(void \*\)i

regression/cbmc-java/NullPointer1/test.desc

@@ -3,7 +3,7 @@ NullPointer1.class
 --pointer-check --stop-on-fail
 ^EXIT=10$
 ^SIGNAL=0$
-^  file NullPointer1.java line 16 function java::NullPointer1.main:(\[Ljava/lang/String;)V$
+^  file NullPointer1.java line 16 function java::NullPointer1.main:\(\[Ljava/lang/String;\)V$
 ^VERIFICATION FAILED$
 --
 ^warning: ignoring

regression/cbmc-java/NullPointer2/test.desc

@@ -3,7 +3,7 @@ NullPointer2.class
 --pointer-check --stop-on-fail
 ^EXIT=10$
 ^SIGNAL=0$
-^  file NullPointer2.java line 9 function java::NullPointer2.main:(\[Ljava/lang/String;)V
+^  file NullPointer2.java line 9 function java::NullPointer2.main:\(\[Ljava/lang/String;\)V
 ^VERIFICATION FAILED$
 --
 ^warning: ignoring

regression/cbmc-java/NullPointer3/test.desc

@@ -3,7 +3,7 @@ NullPointer3.class
 --pointer-check --stop-on-fail
 ^EXIT=10$
 ^SIGNAL=0$
-^  file NullPointer3.java line 5 function java::NullPointer3.main:(\[Ljava/lang/String;)V bytecode_index 1$
+^  file NullPointer3.java line 5 function java::NullPointer3.main:\(\[Ljava/lang/String;\)V bytecode_index 1$
 ^VERIFICATION FAILED$
 --
 ^warning: ignoring

regression/cbmc-java/NullPointer4/test.desc

@@ -3,7 +3,7 @@ NullPointer4.class
 --pointer-check --stop-on-fail
 ^EXIT=10$
 ^SIGNAL=0$
-^  file NullPointer4.java line 6 function java::NullPointer4.main:(\[Ljava/lang/String;)V$
+^  file NullPointer4.java line 6 function java::NullPointer4.main:\(\[Ljava/lang/String;\)V$
 ^VERIFICATION FAILED$
 --
 ^warning: ignoring

regression/cbmc-java/VarLengthArrayTrace1/test.desc

@@ -7,4 +7,4 @@ dynamic_3_array\[1l\]=10
 --
 ^warning: ignoring
 assignment removed
-irep("(\\"nil\\")")
+irep\("\(\\"nil\\"\)"\)

regression/cbmc-java/enum1/test.desc

@@ -3,6 +3,6 @@ enum1.class
 --java-unwind-enum-static --unwind 3
 ^EXIT=10$
 ^SIGNAL=0$
-^Unwinding loop java::enum1.<clinit>:()V.0 iteration 5 (6 max) file enum1.java line 6 function java::enum1.<clinit>:()V bytecode_index 78 thread 0$
+^Unwinding loop java::enum1.<clinit>:\(\)V.0 iteration 5 \(6 max\) file enum1.java line 6 function java::enum1.<clinit>:\(\)V bytecode_index 78 thread 0$
 --
 ^warning: ignoring