Merge pull request #1645 from martin-cs/goto-analyzer-6-part3

Goto analyzer 6 part3

Author: tautschnig

regression/goto-analyzer/constant_propagation_01/constant_propagation1.c renamed to regression/goto-analyzer/constant_propagation_01/main.c

@@ -1,4 +1,3 @@
-#include <assert.h>
 
 int main()
 {

regression/goto-analyzer/constant_propagation_01/test.desc

@@ -1,9 +1,9 @@
-FUTURE
-constant_propagation1.c
---constants --simplify out.goto
+CORE
+main.c
+--constants --simplify out.gb
 ^EXIT=0$
 ^SIGNAL=0$
-^SIMPLIFIED:  assert: 1, assume: 0, goto: 2, assigns: 5, function calls: 0$
-^UNMODIFIED:  assert: 0, assume: 0, goto: 0, assigns: 12, function calls: 2$
+^Simplified:  assert: 1, assume: 0, goto: 1, assigns: 5, function calls: 0$
+^Unmodified:  assert: 0, assume: 0, goto: 0, assigns: 12, function calls: 2$
 --
 ^warning: ignoring

regression/goto-analyzer/constant_propagation_02/constant_propagation_02.c renamed to regression/goto-analyzer/constant_propagation_02/main.c

@@ -1,4 +1,3 @@
-#include <assert.h>
 
 int main()
 {

regression/goto-analyzer/constant_propagation_02/original

@@ -1,9 +1,9 @@
-FUTURE
-constant_propagation_02.c
---constants --simplify out.goto
+CORE
+main.c
+--constants --simplify out.gb
 ^EXIT=0$
 ^SIGNAL=0$
-^SIMPLIFIED:  assert: 1, assume: 0, goto: 2, assigns: 6, function calls: 0$
-^UNMODIFIED:  assert: 0, assume: 0, goto: 0, assigns: 11, function calls: 2$
+^Simplified:  assert: 1, assume: 0, goto: 1, assigns: 6, function calls: 0$
+^Unmodified:  assert: 0, assume: 0, goto: 0, assigns: 11, function calls: 2$
 --
 ^warning: ignoring

regression/goto-analyzer/constant_propagation_02/simplified

@@ -1,4 +1,3 @@
-#include <assert.h>
 
 int main()
 {

regression/goto-analyzer/constant_propagation_02/test.desc

@@ -1,9 +1,9 @@
 FUTURE
-constant_propagation_03.c
---constants --simplify out.goto
+main.c
+--constants --simplify out.gb
 ^EXIT=0$
 ^SIGNAL=0$
-^SIMPLIFIED:  assert: 1, assume: 0, goto: 2, assigns: 6, function calls: 0$
-^UNMODIFIED:  assert: 0, assume: 0, goto: 0, assigns: 11, function calls: 2$
+^Simplified:  assert: 1, assume: 0, goto: 2, assigns: 6, function calls: 0$
+^Unmodified:  assert: 0, assume: 0, goto: 0, assigns: 11, function calls: 2$
 --
 ^warning: ignoring

regression/goto-analyzer/constant_propagation_03/constant_propagation_03.c renamed to regression/goto-analyzer/constant_propagation_03/main.c

@@ -1,4 +1,3 @@
-#include <assert.h>
 
 int main()
 {

regression/goto-analyzer/constant_propagation_03/test.desc

@@ -1,9 +1,9 @@
 FUTURE
-constant_propagation_04.c
---constants --simplify out.goto
+main.c
+--constants --simplify out.gb
 ^EXIT=0$
 ^SIGNAL=0$
-^SIMPLIFIED:  assert: 1, assume: 0, goto: 2, assigns: 6, function calls: 0$
-^UNMODIFIED:  assert: 0, assume: 0, goto: 0, assigns: 11, function calls: 2$
+^Simplified:  assert: 1, assume: 0, goto: 2, assigns: 6, function calls: 0$
+^Unmodified:  assert: 0, assume: 0, goto: 0, assigns: 11, function calls: 2$
 --
 ^warning: ignoring