Merge pull request diffblue#1378 from thk123/bugfix/fix-symex-appveyor

Bugfix/fix symex appveyor
smowton · Sep 13, 2017 · d45325c · d45325c
2 parents 41bafc0 + 91e733d
commit d45325c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -56,7 +56,6 @@ build_script:
     call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x64
     sed -i "s/BUILD_ENV[ ]*=.*/BUILD_ENV = MSVC/" src/config.inc
     make -C src -j2
-    make -C src symex.dir -j2
 
 test_script:
 - cmd: |
@@ -112,6 +111,11 @@ test_script:
     rmdir /s /q cbmc-java\tableswitch2
     rmdir /s /q goto-gcc
     rmdir /s /q goto-instrument\slice08
+    rmdir /s /q symex\va_args_10
+    rmdir /s /q symex\va_args_2
+    rmdir /s /q symex\va_args_3
+    rmdir /s /q symex\va_args_5
+    rmdir /s /q symex\va_args_6
 
     make test
 

diff --git a/regression/Makefile b/regression/Makefile
@@ -12,6 +12,7 @@ DIRS = ansi-c \
        invariants \
        strings \
        strings-smoke-tests \
+       symex \
        test-script \
        # Empty last line
 

diff --git a/regression/symex/Makefile b/regression/symex/Makefile
@@ -1,10 +1,16 @@
 default: tests.log
 
 test:
-	@../test.pl -c ../../../src/symex/symex
+	@if ! ../test.pl -c ../../../src/symex/symex ; then \
+		../failed-tests-printer.pl ; \
+		exit 1 ; \
+	fi
 
 tests.log: ../test.pl
-	@../test.pl -c ../../../src/symex/symex
+	@if ! ../test.pl -c ../../../src/symex/symex ; then \
+		../failed-tests-printer.pl ; \
+		exit 1 ; \
+	fi
 
 show:
 	@for dir in *; do \