Skip to content

Commit 895b0e7

Browse files
Daniel Kroeningpeterschrammel
Daniel Kroening
authored andcommitted
the jbmc tests now work on Windows
1 parent 8966f09 commit 895b0e7

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

appveyor.yml

-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ test_script:
8484
rmdir /s /q jbmc\VarLengthArrayTrace1
8585
rmdir /s /q jbmc\classpath1
8686
rmdir /s /q jbmc\jar-file3
87-
rmdir /s /q jbmc\tableswitch2
8887
cd ../..
8988
9089
make -C jbmc/regression test BUILD_ENV=MSVC

buildspec-windows.yml

+8-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ phases:
2020
- |
2121
$env:Path = "C:\tools\cygwin\bin;$env:Path"
2222
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" '
23-
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" '
23+
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" '
2424
2525
post_build:
2626
commands:
@@ -45,6 +45,11 @@ phases:
4545
Remove-Item goto-instrument\slice08 -Force -Recurse
4646
Remove-Item goto-analyzer/constant_propagation_nondet_rounding_mode -Force -Recurse
4747
cd ..
48+
cd jbmc/regression
49+
Remove-Item jbmc\VarLengthArrayTrace1 -Force -Recurse
50+
Remove-Item jbmc\classpath1 -Force -Recurse
51+
Remove-Item jbmc\jar-file3 -Force -Recurse
52+
cd ../..
4853
4954
- |
5055
$env:Path = "C:\tools\cygwin\bin;$env:Path"
@@ -56,11 +61,11 @@ phases:
5661
5762
- |
5863
$env:Path = "C:\tools\cygwin\bin;$env:Path"
59-
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" '
64+
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" '
6065
6166
- |
6267
$env:Path = "C:\tools\cygwin\bin;$env:Path"
63-
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" '
68+
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" '
6469
6570
artifacts:
6671
files:

0 commit comments

Comments
 (0)