Merge pull request diffblue#2495 from diffblue/aws-codebuild-windows-…

…jbmc-tests the jbmc tests now work on Windows
NathanJPhillips · Jul 19, 2018 · 14dc11e · 14dc11e
2 parents cefdc21 + f795ef9
commit 14dc11e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -84,7 +84,6 @@ test_script:
     rmdir /s /q jbmc\VarLengthArrayTrace1
     rmdir /s /q jbmc\classpath1
     rmdir /s /q jbmc\jar-file3
-    rmdir /s /q jbmc\tableswitch2
     cd ../..
 
     make -C jbmc/regression test BUILD_ENV=MSVC

diff --git a/buildspec-windows.yml b/buildspec-windows.yml
@@ -20,7 +20,7 @@ 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 -j4 -C jbmc/src setup-submodules" && bash -c "make -j4 -C jbmc/src BUILD_ENV=MSVC" '
-        cmd /c 'call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 && bash -c "make -j4 -C jbmc/unit all BUILD_ENV=MSVC ; exit 0" '
+        cmd /c 'call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 && bash -c "make -j4 -C jbmc/unit all BUILD_ENV=MSVC" '
 
   post_build:
     commands:
@@ -45,6 +45,11 @@ phases:
         Remove-Item goto-instrument\slice08 -Force -Recurse
         Remove-Item goto-analyzer/constant_propagation_nondet_rounding_mode -Force -Recurse
         cd ..
+        cd jbmc/regression
+        Remove-Item jbmc\VarLengthArrayTrace1 -Force -Recurse
+        Remove-Item jbmc\classpath1 -Force -Recurse
+        Remove-Item jbmc\jar-file3 -Force -Recurse
+        cd ../..
 
       - |
         $env:Path = "C:\tools\cygwin\bin;$env:Path"
@@ -56,11 +61,11 @@ 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 jbmc/regression test BUILD_ENV=MSVC ; exit 0" '
+        cmd /c 'call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 && bash -c "make -C jbmc/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 jbmc/unit test BUILD_ENV=MSVC ; exit 0" '
+        cmd /c 'call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 && bash -c "make -C jbmc/unit test BUILD_ENV=MSVC" '
 
 artifacts:
   files:

diff --git a/jbmc/regression/jbmc-cover/generics/test.desc b/jbmc/regression/jbmc-cover/generics/test.desc
@@ -7,5 +7,3 @@ file AbstractTest.java line 18 .* SATISFIED
 file AbstractTest.java line 19 .* SATISFIED
 file AbstractTest.java line 20 .* SATISFIED
 file AbstractTest.java line 21 .* SATISFIED
-
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,5 +7,3 @@ file AbstractTest.java line 18 .* SATISFIED
		file AbstractTest.java line 19 .* SATISFIED
		file AbstractTest.java line 20 .* SATISFIED
		file AbstractTest.java line 21 .* SATISFIED