Merge pull request diffblue#2332 from diffblue/goto-cc-warning-syntax

fix test result for goto-cl

appveyor.yml

@@ -72,11 +72,8 @@ test_script:
     rmdir /s /q ansi-c\Incomplete_Type1
     rmdir /s /q ansi-c\Union_Padding1
     rmdir /s /q ansi-c\Universal_characters1
-    rmdir /s /q ansi-c\function_return1
     rmdir /s /q ansi-c\gcc_attributes7
     rmdir /s /q ansi-c\gcc_version1
-    rmdir /s /q ansi-c\struct6
-    rmdir /s /q ansi-c\struct7
     rmdir /s /q cbmc\Malloc23
     rmdir /s /q cbmc\byte_update2
     rmdir /s /q cbmc\byte_update3

buildspec-windows.yml

@@ -35,11 +35,8 @@ phases:
         Remove-Item ansi-c\Forward_Declaration2 -Force -Recurse
         Remove-Item ansi-c\Incomplete_Type1 -Force -Recurse
         Remove-Item ansi-c\Union_Padding1 -Force -Recurse
-        Remove-Item ansi-c\function_return1 -Force -Recurse
         Remove-Item ansi-c\gcc_attributes7 -Force -Recurse
         Remove-Item ansi-c\gcc_version1 -Force -Recurse
-        Remove-Item ansi-c\struct6 -Force -Recurse
-        Remove-Item ansi-c\struct7 -Force -Recurse
         Remove-Item cbmc\Malloc23 -Force -Recurse
         Remove-Item cbmc\byte_update2 -Force -Recurse
         Remove-Item cbmc\byte_update3 -Force -Recurse

regression/ansi-c/function_return1/test.desc

@@ -1,7 +1,7 @@
 CORE
 main.c
 --verbosity 2
-^main.c:3:1: warning: function has return void but a return statement returning signed int$
+: function has return void but a return statement returning signed int$
 ^EXIT=0$
 ^SIGNAL=0$
 --

regression/ansi-c/struct6/test.desc

@@ -3,6 +3,6 @@ main.c
 
 ^EXIT=(64|1)$
 ^SIGNAL=0$
-^main.c:2:1: error: incomplete type not permitted here$
+: incomplete type not permitted here$
 ^CONVERSION ERROR$
 --

regression/ansi-c/struct7/test.desc

@@ -3,6 +3,6 @@ main.c
 
 ^EXIT=(64|1)$
 ^SIGNAL=0$
-^main.c:4:1: error: duplicate member .*$
+: duplicate member .*$
 ^CONVERSION ERROR$
 --