Merge pull request #3659 from tautschnig/platform-tests

Include goto-cl regression tests in test sequence [depends-on: #3674]

Author: tautschnig

buildspec-windows.yml

@@ -36,31 +36,10 @@ phases:
 
   post_build:
     commands:
-      - |
-        cd regression
-        # HACK disable failing tests
-        Remove-Item ansi-c\Forward_Declaration2 -Force -Recurse
-        Remove-Item cbmc\Malloc23 -Force -Recurse
-        Remove-Item cbmc\byte_update2 -Force -Recurse
-        Remove-Item cbmc\byte_update3 -Force -Recurse
-        Remove-Item cbmc\byte_update4 -Force -Recurse
-        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
-        cd ../..
-
       - |
         $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,28 +16,24 @@ DIRS = cbmc \
        test-script \
        goto-analyzer-taint \
        goto-gcc \
+       goto-cl \
        goto-cc-cbmc \
        cbmc-cpp \
        goto-cc-goto-analyzer \
        systemc \
        contracts \
        # Empty last line
 
-# Tests under goto-gcc cannot be run on Windows, so appveyor.yml unlinks
-# the entire directory under Windows. This variable will contain the list
-# of directories that actually exist on the current platform.
-PLATFORM_DIRS = $(wildcard $(DIRS))
-
 # Run all test directories in sequence
 .PHONY: test
 test:
-	@for dir in $(PLATFORM_DIRS); do \
+	@for dir in $(DIRS); do \
 		$(MAKE) "$$dir" || exit 1; \
 	done;
 
 # Pattern to execute a single test suite directory
-.PHONY: $(PLATFORM_DIRS)
-$(PLATFORM_DIRS):
+.PHONY: $(DIRS)
+$(DIRS):
 	@echo "Running $@..." ;
 	$(MAKE) -C "$@" test || exit 1;
 
@@ -53,7 +49,7 @@ test-parallel:
 		--linebuffer \
 		--jobs $(JOBS) \
 		$(MAKE) "{}" \
-		::: $(PLATFORM_DIRS)
+		::: $(DIRS)
 
 
 .PHONY: clean

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-gcc/builtin_is/main.c renamed to regression/ansi-c/builtin_is/main.c

@@ -1,4 +1,4 @@
-KNOWNBUG
+KNOWNBUG gcc-only
 main.c
 
 ^EXIT=1$

regression/goto-gcc/builtin_is/test.desc renamed to regression/ansi-c/builtin_is/test.desc

@@ -1,4 +1,4 @@
-KNOWNBUG
+KNOWNBUG gcc-only
 main.c
 
 ^EXIT=1$

regression/goto-gcc/builtin_va_copy_lvalue/main.c renamed to regression/ansi-c/builtin_va_copy_lvalue/main.c

@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 main.c
 
 ^EXIT=1$

regression/goto-gcc/builtin_va_copy_lvalue/test.desc renamed to regression/ansi-c/builtin_va_copy_lvalue/test.desc

@@ -1,4 +1,4 @@
-KNOWNBUG
+KNOWNBUG gcc-only
 main.c
 
 ^EXIT=1$

regression/goto-gcc/builtin_va_copy_two/main.c renamed to regression/ansi-c/builtin_va_copy_two/main.c

@@ -1,4 +1,4 @@
-CORE
+CORE gcc-only
 main.c
 
 ^EXIT=1$

regression/goto-gcc/builtin_va_end_one/test.desc renamed to regression/ansi-c/builtin_va_copy_two/test.desc

@@ -1,4 +1,4 @@
-KNOWNBUG
+KNOWNBUG gcc-only
 main.c
 
 ^EXIT=1$

regression/goto-gcc/builtin_va_end_lvalue/main.c renamed to regression/ansi-c/builtin_va_end_lvalue/main.c

@@ -1,4 +1,4 @@
-KNOWNBUG
+KNOWNBUG gcc-only
 main.c
 
 ^EXIT=1$

regression/goto-gcc/builtin_va_start_lvalue/test.desc renamed to regression/ansi-c/builtin_va_end_lvalue/test.desc

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

regression/goto-gcc/builtin_va_end_one/main.c renamed to regression/ansi-c/builtin_va_end_one/main.c

@@ -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/builtin_va_copy_two/test.desc renamed to regression/ansi-c/builtin_va_end_one/test.desc

@@ -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 \