mark gcc tests as 'gcc-only' to prevent execution by goto-cl on Windows

kroening · kroening · commit 95d17ba29879 · 2018-06-12T09:24:31.000+01:00
diff --git a/appveyor.yml b/appveyor.yml
@@ -64,16 +64,10 @@ test_script:
 - cmd: |
     cd regression
     rem HACK disable failing tests
-    rmdir /s /q ansi-c\arch_flags_mcpu_bad
-    rmdir /s /q ansi-c\arch_flags_mcpu_good
-    rmdir /s /q ansi-c\arch_flags_mthumb_bad
-    rmdir /s /q ansi-c\arch_flags_mthumb_good
     rmdir /s /q ansi-c\Forward_Declaration2
     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\gcc_attributes7
-    rmdir /s /q ansi-c\gcc_version1
     rmdir /s /q cbmc\Malloc23
     rmdir /s /q cbmc\byte_update2
     rmdir /s /q cbmc\byte_update3
diff --git a/buildspec-windows.yml b/buildspec-windows.yml
@@ -28,15 +28,9 @@ phases:
       - |
         cd regression
         # HACK disable failing tests
-        Remove-Item ansi-c\arch_flags_mcpu_bad -Force -Recurse
-        Remove-Item ansi-c\arch_flags_mcpu_good -Force -Recurse
-        Remove-Item ansi-c\arch_flags_mthumb_bad -Force -Recurse
-        Remove-Item ansi-c\arch_flags_mthumb_good -Force -Recurse
         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\gcc_attributes7 -Force -Recurse
-        Remove-Item ansi-c\gcc_version1 -Force -Recurse
         Remove-Item cbmc\Malloc23 -Force -Recurse
         Remove-Item cbmc\byte_update2 -Force -Recurse
         Remove-Item cbmc\byte_update3 -Force -Recurse
diff --git a/regression/ansi-c/Makefile b/regression/ansi-c/Makefile
@@ -4,7 +4,7 @@ include ../../src/config.inc
 include ../../src/common
 
 ifeq ($(BUILD_ENV_),MSVC)
-	exe=../../../src/goto-cc/goto-cl
+	exe=../../../src/goto-cc/goto-cl -X gcc-only
 else
 	exe=../../../src/goto-cc/goto-cc
 endif
diff --git a/regression/ansi-c/arch_flags_mcpu_bad/test.desc b/regression/ansi-c/arch_flags_mcpu_bad/test.desc
@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 preproc.i
 -mcpu=cortex-a15 -o linked-object.gb object.intel
 ^EXIT=(64|1)$
diff --git a/regression/ansi-c/arch_flags_mcpu_good/test.desc b/regression/ansi-c/arch_flags_mcpu_good/test.desc
@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 preproc.i
 -mcpu=cortex-a15 -o linked-object.gb object.arm
 ^EXIT=0$
diff --git a/regression/ansi-c/arch_flags_mthumb_bad/test.desc b/regression/ansi-c/arch_flags_mthumb_bad/test.desc
@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 preproc.i
 -mthumb -o linked-object.gb object.intel
 ^EXIT=(64|1)$
diff --git a/regression/ansi-c/arch_flags_mthumb_good/test.desc b/regression/ansi-c/arch_flags_mthumb_good/test.desc
@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 preproc.i
 -mthumb -o linked-object.gb object.arm
 ^EXIT=0$
diff --git a/regression/ansi-c/gcc___auto_type1/test.desc b/regression/ansi-c/gcc___auto_type1/test.desc
@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 main.c
 
 ^EXIT=0$
diff --git a/regression/ansi-c/gcc_attributes1/test.desc b/regression/ansi-c/gcc_attributes1/test.desc
@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 main.c
 
 ^EXIT=0$
diff --git a/regression/ansi-c/gcc_attributes10/test.desc b/regression/ansi-c/gcc_attributes10/test.desc
@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 main.c
 
 ^EXIT=0$
diff --git a/regression/ansi-c/gcc_attributes11/test.desc b/regression/ansi-c/gcc_attributes11/test.desc
@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 main.c
 
 ^EXIT=0$
diff --git a/regression/ansi-c/gcc_attributes12/test.desc b/regression/ansi-c/gcc_attributes12/test.desc
@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 main.c
 
 ^EXIT=0$
diff --git a/regression/ansi-c/gcc_attributes13/test.desc b/regression/ansi-c/gcc_attributes13/test.desc
@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 main.c
 
 ^EXIT=0$
diff --git a/regression/ansi-c/gcc_attributes2/test.desc b/regression/ansi-c/gcc_attributes2/test.desc
@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 main.c
 
 ^EXIT=0$
diff --git a/regression/ansi-c/gcc_attributes3/test.desc b/regression/ansi-c/gcc_attributes3/test.desc
@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 main.c
 
 ^EXIT=0$
diff --git a/regression/ansi-c/gcc_attributes4/test.desc b/regression/ansi-c/gcc_attributes4/test.desc
@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 main.c
 
 ^EXIT=0$
diff --git a/regression/ansi-c/gcc_attributes5/test.desc b/regression/ansi-c/gcc_attributes5/test.desc
@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 main.c
 
 ^EXIT=0$
diff --git a/regression/ansi-c/gcc_attributes6/test.desc b/regression/ansi-c/gcc_attributes6/test.desc
@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 main.c
 
 ^EXIT=0$
diff --git a/regression/ansi-c/gcc_attributes7/test.desc b/regression/ansi-c/gcc_attributes7/test.desc
@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 main.i
 
 ^EXIT=0$
diff --git a/regression/ansi-c/gcc_attributes8/test.desc b/regression/ansi-c/gcc_attributes8/test.desc
@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 main.c
 
 ^EXIT=0$
diff --git a/regression/ansi-c/gcc_attributes9/test.desc b/regression/ansi-c/gcc_attributes9/test.desc
@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 main.c
 
 ^EXIT=0$
diff --git a/regression/ansi-c/gcc_builtin_constant_p1/test.desc b/regression/ansi-c/gcc_builtin_constant_p1/test.desc
@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 main.c
 
 ^EXIT=0$
diff --git a/regression/ansi-c/gcc_builtins1/test.desc b/regression/ansi-c/gcc_builtins1/test.desc
@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 main.c
 
 ^EXIT=0$
diff --git a/regression/ansi-c/gcc_builtins2/test.desc b/regression/ansi-c/gcc_builtins2/test.desc
@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 main.c
 
 ^EXIT=0$
diff --git a/regression/ansi-c/gcc_builtins3/test.desc b/regression/ansi-c/gcc_builtins3/test.desc
@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 main.c
 
 ^EXIT=0$
diff --git a/regression/ansi-c/gcc_builtins5/test.desc b/regression/ansi-c/gcc_builtins5/test.desc
@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 main.c
 
 ^EXIT=0$
diff --git a/regression/ansi-c/gcc_builtins6/test.desc b/regression/ansi-c/gcc_builtins6/test.desc
@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 main.c
 
 ^EXIT=0$
diff --git a/regression/ansi-c/gcc_types_compatible_p1/test.desc b/regression/ansi-c/gcc_types_compatible_p1/test.desc
@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 main.c
 
 ^EXIT=0$
diff --git a/regression/ansi-c/gcc_types_compatible_p2/test.desc b/regression/ansi-c/gcc_types_compatible_p2/test.desc
@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 main.c
 
 ^EXIT=0$
diff --git a/regression/ansi-c/gcc_types_compatible_p3/test.desc b/regression/ansi-c/gcc_types_compatible_p3/test.desc
@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 main.c
 
 ^EXIT=0$
diff --git a/regression/ansi-c/gcc_types_compatible_p4/test.desc b/regression/ansi-c/gcc_types_compatible_p4/test.desc
@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 main.c
 
 ^EXIT=0$
diff --git a/regression/ansi-c/gcc_vector1/test.desc b/regression/ansi-c/gcc_vector1/test.desc
@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 main.c
 
 ^EXIT=0$
diff --git a/regression/ansi-c/gcc_version1/test-gcc-4.desc b/regression/ansi-c/gcc_version1/test-gcc-4.desc
@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 gcc-4.c
 --native-compiler ./fake-gcc-4
 ^EXIT=0$
diff --git a/regression/ansi-c/gcc_version1/test-gcc-5.desc b/regression/ansi-c/gcc_version1/test-gcc-5.desc
@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 gcc-5.c
 --native-compiler ./fake-gcc-5
 ^EXIT=0$
diff --git a/regression/ansi-c/gcc_version1/test-gcc-7.desc b/regression/ansi-c/gcc_version1/test-gcc-7.desc
@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 gcc-7.c
 --native-compiler ./fake-gcc-7
 ^EXIT=0$

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-CORE`
	`1`	`+CORE gcc-only`
`2`	`2`	`preproc.i`
`3`	`3`	`-mcpu=cortex-a15 -o linked-object.gb object.intel`
`4`	`4`	`^EXIT=(64\|1)$`