Merge pull request diffblue#264 from danpoe/fixes/goto-analyzer-regression-tests

Fix for goto-analyzer regression tests

Author: chrisr-diffblue

regression/goto-analyzer/dependence-graph13/test.desc

@@ -5,9 +5,9 @@ activate-multi-line-match
 ^EXIT=0$
 ^SIGNAL=0$
 // The function entry points shall have a control dependency on the function call
-Function: main\n.*\n.*\n.*\nControl dependencies: [0-9]+ \[CALL\]
-Function: func\n.*\n.*\n.*\nControl dependencies: [0-9]+ \[CALL\]
-Function: __CPROVER_initialize\n.*\n.*\n.*\nControl dependencies: [0-9]+ \[CALL\]
+Function: main\n.*\n.*\n.*\nControl dependencies: [0-9]+ \[UNCONDITIONAL\]
+Function: func\n.*\n.*\n.*\nControl dependencies: [0-9]+ \[UNCONDITIONAL\]
+Function: __CPROVER_initialize\n.*\n.*\n.*\nControl dependencies: [0-9]+ \[UNCONDITIONAL\]
 --
 // The __CPROVER__start function must not have a control dependency on anything
 Function: __CPROVER__start\n.*\n.*\n.*\nControl dependencies: [0-9]+

regression/goto-analyzer/dependence-graph14/test.desc

@@ -5,7 +5,7 @@ activate-multi-line-match
 ^EXIT=0$
 ^SIGNAL=0$
 Control dependencies: [0-9]+ \[TRUE\]\n.*\n.*\n\s+a = 1;
-Control dependencies: [0-9]+ \[CALL\]\n.*\n.*\n\s+a = 2;
+Control dependencies: [0-9]+ \[UNCONDITIONAL\]\n.*\n.*\n\s+a = 2;
 
 --
 ^warning: ignoring

regression/goto-analyzer/variable-sensitivity-dependence-graph-merge/test.desc

@@ -3,5 +3,5 @@ main.c
 --dependence-graph-vs --structs --arrays --verify
 EXIT=0
 SIGNAL=0
-^\[main.assertion.1\] file .* function main, idx==1: Unknown$
+^\[main.assertion.1\] file .* function main, s_str.idx > 1: Unknown$
 --