fixup coverage tests

Author: kroening

regression/cbmc-cover/branch3/test.desc

@@ -3,6 +3,7 @@ main.c
 --cover branch --unwind 6
 ^EXIT=0$
 ^SIGNAL=0$
-^\*\* .* of .* covered \(100.0%\)$
+^\*\* .* of .* covered \(.*\)$
 --
 ^warning: ignoring
+^\[main.coverage.*\] file main.c line .* function main block .* branch .*: FAILED$

regression/cbmc-cover/built-ins1/test.desc

@@ -3,7 +3,7 @@ main.c
 --cover location --unwind 1
 ^EXIT=0$
 ^SIGNAL=0$
-^\*\* 4 of 7 covered
+^\*\* 5 of 8 covered
 --
 ^warning: ignoring
 ^\[.*<builtin-library-

regression/cbmc-cover/built-ins3/main.c

@@ -5,6 +5,8 @@ int main()
   const char *s="test";
   int ret=puts(s); //return value is nondet (internal to built-in, thus non-controllable)
 
+  __CPROVER_input("return value puts", ret);
+
   if(ret<0)
   {
     return 1;

regression/cbmc-cover/built-ins3/test.desc

@@ -3,7 +3,7 @@ main.c
 --cover location --unwind 10
 ^EXIT=0$
 ^SIGNAL=0$
-^\*\* 4 of 4 covered
+^\*\* 5 of .* covered
 --
 ^warning: ignoring
 ^\[.*<builtin-library-

regression/cbmc-cover/inlining1/test.desc

@@ -3,7 +3,7 @@ main.c
 --cover branch
 ^EXIT=0$
 ^SIGNAL=0$
-^\[main.coverage.1\] file main.c line 13 function main entry point: SATISFIED$
+^\[main.coverage.1\] file main.c line 15 function main entry point: SATISFIED$
 ^\[my_func.coverage.1\] file main.c line 5 function my_func entry point: SATISFIED$
 ^\[my_func.coverage.2\] file main.c line 5 function my_func block 1 branch false: SATISFIED$
 ^\[my_func.coverage.3\] file main.c line 5 function my_func block 1 branch true: SATISFIED$