Simplify fp tests now checking the simplified GOTO

Due to high variation in the number of generated goto statements on
different platforms, checking specific number simplified is unreliable.
This changes the tests to first simplify then spit out the generated
GOTO code. This is then checked to check the if statements generated by
function pointer removal is removed by the simplify step

Author: thk123

regression/goto-analyze-show-goto-functions/Makefile

@@ -0,0 +1,31 @@
+
+default: tests.log
+
+test:
+	@if ! ../test.pl -c ../chain.sh ; then \
+		../failed-tests-printer.pl ; \
+		exit 1; \
+	fi
+
+tests.log:
+	@if ! ../test.pl -c ../chain.sh ; then \
+		../failed-tests-printer.pl ; \
+		exit 1; \
+	fi
+
+show:
+	@for dir in *; do \
+		if [ -d "$$dir" ]; then \
+			vim -o "$$dir/*.c" "$$dir/*.out"; \
+		fi; \
+	done;
+
+clean:
+	@for dir in *; do \
+		rm -f tests.log; \
+		if [ -d "$$dir" ]; then \
+			cd "$$dir"; \
+			rm -f *.out *.gb; \
+			cd ..; \
+		fi \
+	done

regression/goto-analyze-show-goto-functions/chain.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+SRC=../../../src
+GA=$SRC/goto-analyzer/goto-analyzer
+
+if [ -a $1_simplified.gb ]
+  then
+    rm $1_simplified.gb
+fi
+$GA $1 --simplify $1_simplified.gb --variable --arrays --structs --pointers
+$GA $1_simplified.gb --show-goto-functions

regression/goto-analyzer/simplify-fp-const-lost/main.c renamed to regression/goto-analyze-show-goto-functions/simplify-fp-const-lost/main.c

@@ -0,0 +1,18 @@
+CORE
+main.c
+
+^\s*f4\(\);$
+^SIGNAL=0$
+--
+^warning: ignoring
+^\s*\d+: f1\(\);$
+^\s*\d+: f2\(\);$
+^\s*\d+: f3\(\);$
+^\s*\d+: f5\(\);$
+^\s*\d+: f6\(\);$
+^\s*\d+: f7\(\);$
+^\s*\d+: f8\(\);$
+^\s*\d+: f9\(\);$
+--
+Check the simplified goto program doesn't call any of the other functions (i.e
+it has simplified all the unused cases generated by function pointer removal)

regression/goto-analyze-show-goto-functions/simplify-fp-const-lost/test.desc

@@ -1,12 +1,18 @@
 FUTURE
 main.c
---simplify out_simplified.gb --variable --arrays --structs --pointers
-^Simplified:  .* goto: 8
-^Unmodified:  .* goto: 10
+
+^\s*f3\(\);$
 ^SIGNAL=0$
-^EXIT=0$
 --
 ^warning: ignoring
+^\s*\d+: f1\(\);$
+^\s*\d+: f2\(\);$
+^\s*\d+: f4\(\);$
+^\s*\d+: f5\(\);$
+^\s*\d+: f6\(\);$
+^\s*\d+: f7\(\);$
+^\s*\d+: f8\(\);$
+^\s*\d+: f9\(\);$
 --
 Check the GOTOs generated by the function pointer removal are removed by the
 simplify step. This requires supporting tracking arrays assigned dynamically

regression/goto-analyzer/simplify-fp-dynamic-array-fp/main.c renamed to regression/goto-analyze-show-goto-functions/simplify-fp-dynamic-array-fp/main.c

@@ -0,0 +1,18 @@
+CORE
+main.c
+
+^SIGNAL=0$
+^\s*f2\(\);$
+--
+^warning: ignoring
+^\s*\d+: f1\(\);$
+^\s*\d+: f3\(\);$
+^\s*\d+: f4\(\);$
+^\s*\d+: f5\(\);$
+^\s*\d+: f6\(\);$
+^\s*\d+: f7\(\);$
+^\s*\d+: f8\(\);$
+^\s*\d+: f9\(\);$
+--
+Check the GOTOs generated by the function pointer removal are removed by the
+simplify step.

regression/goto-analyzer/simplify-fp-dynamic-array-fp/test.desc renamed to regression/goto-analyze-show-goto-functions/simplify-fp-dynamic-array-fp/test.desc

@@ -0,0 +1,18 @@
+FUTURE
+main.c
+
+^SIGNAL=0$
+^\s*f5\(\);$
+--
+^warning: ignoring
+^\s*\d+: f1\(\);$
+^\s*\d+: f2\(\);$
+^\s*\d+: f3\(\);$
+^\s*\d+: f4\(\);$
+^\s*\d+: f6\(\);$
+^\s*\d+: f7\(\);$
+^\s*\d+: f8\(\);$
+^\s*\d+: f9\(\);$
+--
+Check the GOTOs generated by the function pointer removal are removed by the
+simplify step

regression/goto-analyzer/simplify-fp-fp-param/main.c renamed to regression/goto-analyze-show-goto-functions/simplify-fp-fp-param/main.c

@@ -0,0 +1,18 @@
+FUTURE
+main.c
+
+^SIGNAL=0$
+^\s*f5\(\);$
+--
+^warning: ignoring
+^\s*\d+: f1\(\);$
+^\s*\d+: f2\(\);$
+^\s*\d+: f3\(\);$
+^\s*\d+: f4\(\);$
+^\s*\d+: f6\(\);$
+^\s*\d+: f7\(\);$
+^\s*\d+: f8\(\);$
+^\s*\d+: f9\(\);$
+--
+Check the GOTOs generated by the function pointer removal are removed by the
+simplify step

regression/goto-analyze-show-goto-functions/simplify-fp-fp-param/test.desc

@@ -0,0 +1,18 @@
+CORE
+main.c
+
+^SIGNAL=0$
+^\s*f3\(\);$
+--
+^warning: ignoring
+^\s*\d+: f1\(\);$
+^\s*\d+: f2\(\);$
+^\s*\d+: f4\(\);$
+^\s*\d+: f5\(\);$
+^\s*\d+: f6\(\);$
+^\s*\d+: f7\(\);$
+^\s*\d+: f8\(\);$
+^\s*\d+: f9\(\);$
+--
+Check the GOTOs generated by the function pointer removal are removed by the
+simplify step

regression/goto-analyzer/simplify-fp-modified-array-pointer-fp/main.c renamed to regression/goto-analyze-show-goto-functions/simplify-fp-modified-array-pointer-fp/main.c

@@ -0,0 +1,18 @@
+CORE
+main.c
+
+^SIGNAL=0$
+^\s*f4\(\);$
+--
+^warning: ignoring
+^\s*\d+: f1\(\);$
+^\s*\d+: f2\(\);$
+^\s*\d+: f3\(\);$
+^\s*\d+: f5\(\);$
+^\s*\d+: f6\(\);$
+^\s*\d+: f7\(\);$
+^\s*\d+: f8\(\);$
+^\s*\d+: f9\(\);$
+--
+Check the GOTOs generated by the function pointer removal are removed by the
+simplify step

regression/goto-analyze-show-goto-functions/simplify-fp-modified-array-pointer-fp/test.desc

@@ -1,12 +1,18 @@
 CORE
 main.c
---simplify out_simplified.gb --variable --arrays --structs --pointers
-^Simplified:  .* goto: 3
-^Unmodified:  .* goto: 15
+
 ^SIGNAL=0$
-^EXIT=0$
+^\s*f2\(\);$
 --
 ^warning: ignoring
+^\s*\d+: f1\(\);$
+^\s*\d+: f3\(\);$
+^\s*\d+: f4\(\);$
+^\s*\d+: f5\(\);$
+^\s*\d+: f6\(\);$
+^\s*\d+: f7\(\);$
+^\s*\d+: f8\(\);$
+^\s*\d+: f9\(\);$
 --
 Check the GOTOs generated by the function pointer removal are removed by the
 simplify step. The number fo removed goto statements doesn't seem correct,