Include goto-cl regression tests in test sequence

Instead of special-casing the goto-cl folder via the CI configuration move all
target-platform specific logic into the (C)Makefile. Also make sure exclusion
patterns are used consistently.

Author: tautschnig

buildspec-windows.yml

@@ -47,7 +47,6 @@ phases:
         Remove-Item cbmc\byte_update5 -Force -Recurse
         Remove-Item cbmc\byte_update6 -Force -Recurse
         Remove-Item cbmc\byte_update7 -Force -Recurse
-        Remove-Item goto-gcc -Force -Recurse
         cd ..
         cd jbmc/regression
         Remove-Item jbmc\VarLengthArrayTrace1 -Force -Recurse
@@ -57,10 +56,6 @@ phases:
         $env:Path = "C:\tools\cygwin\bin;$env:Path"
         cmd /c 'call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 && bash -c "make -C regression test BUILD_ENV=MSVC" '
 
-      - |
-        $env:Path = "C:\tools\cygwin\bin;$env:Path"
-        cmd /c 'call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 && bash -c "make -C regression/goto-cl test BUILD_ENV=MSVC" '
-
       - |
         $env:Path = "C:\tools\cygwin\bin;$env:Path"
         cmd /c 'call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 && bash -c "make -C unit test BUILD_ENV=MSVC" '

regression/CMakeLists.txt

@@ -39,6 +39,8 @@ add_subdirectory(test-script)
 add_subdirectory(goto-analyzer-taint)
 if(NOT WIN32)
   add_subdirectory(goto-gcc)
+else()
+  add_subdirectory(goto-cl)
 endif()
 add_subdirectory(goto-cc-cbmc)
 add_subdirectory(cbmc-cpp)

regression/Makefile

@@ -16,6 +16,7 @@ DIRS = cbmc \
        test-script \
        goto-analyzer-taint \
        goto-gcc \
+       goto-cl \
        goto-cc-cbmc \
        cbmc-cpp \
        goto-cc-goto-analyzer \

regression/ansi-c/CMakeLists.txt

@@ -1,3 +1,9 @@
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+add_test_pl_tests(
+    "$<TARGET_FILE:goto-cc>" -X gcc-only
+)
+else()
 add_test_pl_tests(
     "$<TARGET_FILE:goto-cc>"
 )
+endif()

regression/goto-cl/CMakeLists.txt

@@ -0,0 +1,3 @@
+add_test_pl_tests(
+    "$<TARGET_FILE:goto-cc>" -X goto-link
+)

regression/goto-cl/Makefile

@@ -1,5 +1,9 @@
 default: tests.log
 
+include ../../src/config.inc
+include ../../src/common
+
+ifeq ($(BUILD_ENV_),MSVC)
 test:
 	@../test.pl -p -c ../../../src/goto-cc/goto-cl -X goto-link
 	@cp ../../src/goto-cc/goto-cl.exe ../../src/goto-cc/goto-link.exe
@@ -10,6 +14,13 @@ tests.log: ../test.pl
 	@cp ../../src/goto-cc/goto-cl.exe ../../src/goto-cc/goto-link.exe
 	@../test.pl -p -c ../../../src/goto-cc/goto-link -I goto-link
 
+else
+test:
+
+tests.log: ../test.pl
+
+endif
+
 show:
 	@for dir in *; do \
 	  if [ -d "$$dir" ]; then \

regression/goto-gcc/Makefile

@@ -1,5 +1,14 @@
 default: tests.log
 
+include ../../src/config.inc
+include ../../src/common
+
+ifeq ($(BUILD_ENV_),MSVC)
+test:
+
+tests.log: ../test.pl
+
+else
 test:
 	-@ln -s goto-cc ../../src/goto-cc/goto-gcc
 	@../test.pl -p -c ../../../src/goto-cc/goto-gcc
@@ -8,6 +17,8 @@ tests.log: ../test.pl
 	-@ln -s goto-cc ../../src/goto-cc/goto-gcc
 	@../test.pl -p -c ../../../src/goto-cc/goto-gcc
 
+endif
+
 show:
 	@for dir in *; do \
 	  if [ -d "$$dir" ]; then \