Merge pull request diffblue#782 from forejtv/cherrypick-appveyor-fixes-to-testgen

Fix appveyor tests on test-gen-support

Author: peterschrammel

regression/acceleration/array_unsafe1/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --no-unwinding-assertions
-
 ^EXIT=10$
 ^SIGNAL=0$
 ^VERIFICATION FAILED$

regression/acceleration/array_unsafe2/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --no-unwinding-assertions
-
 ^EXIT=10$
 ^SIGNAL=0$
 ^VERIFICATION FAILED$

regression/acceleration/array_unsafe3/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --no-unwinding-assertions
-
 ^EXIT=10$
 ^SIGNAL=0$
 ^VERIFICATION FAILED$

regression/acceleration/array_unsafe4/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --no-unwinding-assertions
-
 ^EXIT=10$
 ^SIGNAL=0$
 ^VERIFICATION FAILED$

regression/acceleration/const_unsafe1/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --no-unwinding-assertions
-
 ^EXIT=10$
 ^SIGNAL=0$
 ^VERIFICATION FAILED$

regression/acceleration/diamond_unsafe1/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --no-unwinding-assertions
-
 ^EXIT=10$
 ^SIGNAL=0$
 ^VERIFICATION FAILED$

regression/acceleration/diamond_unsafe2/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --no-unwinding-assertions
-
 ^EXIT=10$
 ^SIGNAL=0$
 ^VERIFICATION FAILED$

regression/acceleration/functions_unsafe1/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --no-unwinding-assertions
-
 ^EXIT=10$
 ^SIGNAL=0$
 ^VERIFICATION FAILED$

regression/acceleration/multivar_unsafe1/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --no-unwinding-assertions
-
 ^EXIT=10$
 ^SIGNAL=0$
 ^VERIFICATION FAILED$

regression/acceleration/nested_unsafe1/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --no-unwinding-assertions
-
 ^EXIT=10$
 ^SIGNAL=0$
 ^VERIFICATION FAILED$

regression/acceleration/overflow_unsafe1/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --no-unwinding-assertions
-
 ^EXIT=10$
 ^SIGNAL=0$
 ^VERIFICATION FAILED$

regression/acceleration/phases_unsafe1/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --no-unwinding-assertions
-
 ^EXIT=10$
 ^SIGNAL=0$
 ^VERIFICATION FAILED$

regression/acceleration/simple_unsafe1/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --no-unwinding-assertions
-
 ^EXIT=10$
 ^SIGNAL=0$
 ^VERIFICATION FAILED$

regression/acceleration/simple_unsafe2/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --no-unwinding-assertions
-
 ^EXIT=10$
 ^SIGNAL=0$
 ^VERIFICATION FAILED$

regression/acceleration/simple_unsafe3/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --no-unwinding-assertions
-
 ^EXIT=10$
 ^SIGNAL=0$
 ^VERIFICATION FAILED$

regression/acceleration/simple_unsafe4/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --no-unwinding-assertions
-
 ^EXIT=10$
 ^SIGNAL=0$
 ^VERIFICATION FAILED$

regression/ansi-c/static_inline1/test.desc

@@ -4,6 +4,5 @@ main.c
 ^EXIT=0$
 ^SIGNAL=0$
 ^VERIFICATION SUCCESSFUL$
-
 --
 ^warning: ignoring

regression/ansi-c/static_inline2/test.desc

@@ -4,6 +4,5 @@ main.c
 ^EXIT=0$
 ^SIGNAL=0$
 ^VERIFICATION SUCCESSFUL$
-
 --
 ^warning: ignoring

regression/cbmc-incr-oneloop/unwind-forever1/test.desc

@@ -3,6 +3,5 @@ main.c
  --incremental-check main.0
 ^EXIT=142$
 ^SIGNAL=0$
-
 --
 ^warning: ignoring

regression/cbmc-incr-oneloop/unwind-forever2/test.desc

@@ -3,6 +3,5 @@ main.c
 --incremental-check main.0
 ^EXIT=142$
 ^SIGNAL=0$
-
 --
 ^warning: ignoring

regression/cbmc-java/tableswitch2/test.desc

@@ -1,7 +1,6 @@
 CORE
 table_switch_neg_offset.class
 --function table_switch_neg_offset.f
-
 ^EXIT=0$
 ^SIGNAL=0$
 ^VERIFICATION SUCCESSFUL$

regression/cpp-linter/function-comment-header1/test.desc

@@ -3,6 +3,5 @@ main.cpp
 
 ^main\.cpp:26:  Could not find function header comment for foo  \[readability/function_comment\] \[4\]
 ^Total errors found: 1$
-
 ^SIGNAL=0$
 --

regression/cpp-linter/struct-inline-decl/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.cpp
 
-
 ^Total errors found: 0$
 ^EXIT=0$
 ^SIGNAL=0$

regression/goto-analyzer/approx-array-variable-const-fp/test.desc

@@ -1,17 +1,16 @@
 CORE
 main.c
 --show-goto-functions --verbosity 10 --pointer-check
-
 ^Removing function pointers and virtual functions$
-^\s*IF fp_tbl\[\(signed long int\)i\] == f2 THEN GOTO [0-9]$
-^\s*IF fp_tbl\[\(signed long int\)i\] == f3 THEN GOTO [0-9]$
-^\s*IF fp_tbl\[\(signed long int\)i\] == f4 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f2 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f3 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f4 THEN GOTO [0-9]$
 ^SIGNAL=0$
 --
-^\s*IF fp_tbl\[\(signed long int\)i\] == f1 THEN GOTO [0-9]$
-^\s*IF fp_tbl\[\(signed long int\)i\] == f5 THEN GOTO [0-9]$
-^\s*IF fp_tbl\[\(signed long int\)i\] == f6 THEN GOTO [0-9]$
-^\s*IF fp_tbl\[\(signed long int\)i\] == f7 THEN GOTO [0-9]$
-^\s*IF fp_tbl\[\(signed long int\)i\] == f8 THEN GOTO [0-9]$
-^\s*IF fp_tbl\[\(signed long int\)i\] == f9 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f1 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f5 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f6 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f7 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f8 THEN GOTO [0-9]$
+^\s*IF fp_tbl\[\(signed (long )*long int\)i\] == f9 THEN GOTO [0-9]$
 ^warning: ignoring

regression/goto-analyzer/approx-const-fp-array-variable-cast-const-fp/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --show-goto-functions --verbosity 10 --pointer-check
-
 ^Removing function pointers and virtual functions$
 ^\s*IF fp == f2 THEN GOTO [0-9]$
 ^\s*IF fp == f3 THEN GOTO [0-9]$

regression/goto-analyzer/approx-const-fp-array-variable-const-fp-with-null/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --show-goto-functions --verbosity 10 --pointer-check
-
 ^Removing function pointers and virtual functions$
 ^\s*IF fp == f2 THEN GOTO [0-9]$
 ^\s*IF fp == f3 THEN GOTO [0-9]$

regression/goto-analyzer/approx-const-fp-array-variable-const-fp/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --show-goto-functions --verbosity 10 --pointer-check
-
 ^Removing function pointers and virtual functions$
 ^\s*IF fp == f2 THEN GOTO [0-9]$
 ^\s*IF fp == f3 THEN GOTO [0-9]$

regression/goto-analyzer/approx-const-fp-array-variable-const-pointer-const-struct-non-const-fp/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --show-goto-functions --verbosity 10 --pointer-check
-
 ^Removing function pointers and virtual functions$
 ^\s*IF fp == f2 THEN GOTO [0-9]$
 ^\s*IF fp == f3 THEN GOTO [0-9]$

regression/goto-analyzer/approx-const-fp-array-variable-const-struct-non-const-fp/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --show-goto-functions --verbosity 10 --pointer-check
-
 ^Removing function pointers and virtual functions$
 ^\s*IF fp == f2 THEN GOTO [0-9]$
 ^\s*IF fp == f3 THEN GOTO [0-9]$

regression/goto-analyzer/approx-const-fp-array-variable-invalid-cast-const-fp/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --show-goto-functions --verbosity 10 --pointer-check
-
 ^Removing function pointers and virtual functions$
 ^\s*IF fp == \(const void_fp\)f2 THEN GOTO [0-9]$
 ^\s*IF fp == \(const void_fp\)f3 THEN GOTO [0-9]$

regression/goto-analyzer/no-match-const-array-const-pointer-const-fp-const-lost/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --show-goto-functions --verbosity 10 --pointer-check
-
 ^Removing function pointers and virtual functions$
 ^\s*IF \*fp == f1 THEN GOTO [0-9]$
 ^\s*IF \*fp == f2 THEN GOTO [0-9]$

regression/goto-analyzer/no-match-const-fp-array-literal-const-fp-run-time/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --show-goto-functions --verbosity 10 --pointer-check
-
 ^Removing function pointers and virtual functions$
 ^\s*IF fp == f1 THEN GOTO [0-9]$
 ^\s*IF fp == f2 THEN GOTO [0-9]$

regression/goto-analyzer/no-match-const-fp-array-literal-non-const-fp-run-time/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --show-goto-functions --verbosity 10 --pointer-check
-
 ^Removing function pointers and virtual functions$
 ^\s*IF fp == f1 THEN GOTO [0-9]$
 ^\s*IF fp == f2 THEN GOTO [0-9]$

regression/goto-analyzer/no-match-const-fp-array-literal-non-const-fp/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --show-goto-functions --verbosity 10 --pointer-check
-
 ^Removing function pointers and virtual functions$
 ^\s*IF fp2 == f1 THEN GOTO [0-9]$
 ^\s*IF fp2 == f2 THEN GOTO [0-9]$

regression/goto-analyzer/no-match-const-fp-array-non-const-fp/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --show-goto-functions --verbosity 10 --pointer-check
-
 ^Removing function pointers and virtual functions$
 ^\s*IF fp2 == f1 THEN GOTO [0-9]$
 ^\s*IF fp2 == f2 THEN GOTO [0-9]$

regression/goto-analyzer/no-match-const-fp-binary-op-const-lost/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --show-goto-functions --verbosity 10 --pointer-check
-
 ^Removing function pointers and virtual functions$
 ^\s*IF fp == f1 THEN GOTO [0-9]$
 ^\s*IF fp == f2 THEN GOTO [0-9]$

regression/goto-analyzer/no-match-const-fp-const-array-index-lost/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --show-goto-functions --verbosity 10 --pointer-check
-
 ^Removing function pointers and virtual functions$
 ^\s*IF \*fp == f1 THEN GOTO [0-9]$
 ^\s*IF \*fp == f2 THEN GOTO [0-9]$

regression/goto-analyzer/no-match-const-fp-const-array-lost/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --show-goto-functions --verbosity 10 --pointer-check
-
 ^Removing function pointers and virtual functions$
 ^\s*IF \*fp == f1 THEN GOTO [0-9]$
 ^\s*IF \*fp == f2 THEN GOTO [0-9]$

regression/goto-analyzer/no-match-const-fp-const-cast/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --show-goto-functions --verbosity 10 --pointer-check
-
 ^Removing function pointers and virtual functions$
 ^\s*IF fp == f1 THEN GOTO [0-9]$
 ^\s*IF fp == f2 THEN GOTO [0-9]$

regression/goto-analyzer/no-match-const-fp-const-lost/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --show-goto-functions --verbosity 10 --pointer-check
-
 ^Removing function pointers and virtual functions$
 ^\s*IF fp == f1 THEN GOTO [0-9]$
 ^\s*IF fp == f2 THEN GOTO [0-9]$

regression/goto-analyzer/no-match-const-fp-const-pointer-const-struct-const-fp-null/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --show-goto-functions --verbosity 10 --pointer-check
-
 ^Removing function pointers and virtual functions$
 ^\s*ASSERT FALSE // invalid function pointer$
 ^SIGNAL=0$

regression/goto-analyzer/no-match-const-fp-const-pointer-non-const-struct-const-fp/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --show-goto-functions --verbosity 10 --pointer-check
-
 ^Removing function pointers and virtual functions$
 ^\s*IF fp == f1 THEN GOTO [0-9]$
 ^\s*IF fp == f2 THEN GOTO [0-9]$

regression/goto-analyzer/no-match-const-fp-dereference-const-pointer-null/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --show-goto-functions --verbosity 10 --pointer-check
-
 ^Removing function pointers and virtual functions$
 ^\s*ASSERT FALSE // invalid function pointer$
 ^SIGNAL=0$

regression/goto-analyzer/no-match-const-fp-dereference-non-const-pointer-const-fp/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --show-goto-functions --verbosity 10 --pointer-check
-
 ^Removing function pointers and virtual functions$
 ^\s*IF final_fp == f1 THEN GOTO [0-9]$
 ^\s*IF final_fp == f2 THEN GOTO [0-9]$

regression/goto-analyzer/no-match-const-fp-dynamic-array-non-const-fp/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --show-goto-functions --verbosity 10 --pointer-check
-
 ^Removing function pointers and virtual functions$
 ^\s*IF fp == f1 THEN GOTO [0-9]$
 ^\s*IF fp == f2 THEN GOTO [0-9]$

regression/goto-analyzer/no-match-const-fp-non-const-pointer-non-const-struct-const-fp/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --show-goto-functions --verbosity 10 --pointer-check
-
 ^Removing function pointers and virtual functions$
 ^\s*IF fp == f1 THEN GOTO [0-9]$
 ^\s*IF fp == f2 THEN GOTO [0-9]$

regression/goto-analyzer/no-match-const-fp-non-const-struct-const-fp/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --show-goto-functions --verbosity 10 --pointer-check
-
 ^Removing function pointers and virtual functions$
 ^\s*IF fp == f1 THEN GOTO [0-9]$
 ^\s*IF fp == f2 THEN GOTO [0-9]$

regression/goto-analyzer/no-match-const-fp-non-const-struct-non-const-fp/test.desc

@@ -1,7 +1,6 @@
 CORE
 main.c
 --show-goto-functions --verbosity 10 --pointer-check
-
 ^Removing function pointers and virtual functions$
 ^\s*IF fp == f1 THEN GOTO [0-9]$
 ^\s*IF fp == f2 THEN GOTO [0-9]$