Skip to content

Commit b3002fa

Browse files
author
Daniel Kroening
committed
the jbmc tests now work on Windows
1 parent 6e554d9 commit b3002fa

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
@@ -90,7 +90,6 @@ test_script:
9090
rmdir /s /q jbmc\VarLengthArrayTrace1
9191
rmdir /s /q jbmc\classpath1
9292
rmdir /s /q jbmc\jar-file3
93-
rmdir /s /q jbmc\tableswitch2
9493
cd ../..
9594
9695
make -C jbmc/regression test

buildspec-windows.yml

+8-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ phases:
2121
- |
2222
$env:Path = "C:\tools\cygwin\bin;$env:Path"
2323
cmd /c 'call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 && bash -c "make -j4 -C jbmc/src" '
24-
cmd /c 'call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 && bash -c "make -j4 -C jbmc/unit all ; exit 0" '
24+
cmd /c 'call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 && bash -c "make -j4 -C jbmc/unit all" '
2525
2626
post_build:
2727
commands:
@@ -46,6 +46,11 @@ phases:
4646
Remove-Item goto-instrument\slice08 -Force -Recurse
4747
Remove-Item goto-analyzer/constant_propagation_nondet_rounding_mode -Force -Recurse
4848
cd ..
49+
cd jbmc/regression
50+
Remove-Item jbmc\VarLengthArrayTrace1 -Force -Recurse
51+
Remove-Item jbmc\classpath1 -Force -Recurse
52+
Remove-Item jbmc\jar-file3 -Force -Recurse
53+
cd ../..
4954
5055
- |
5156
$env:Path = "C:\tools\cygwin\bin;$env:Path"
@@ -57,11 +62,11 @@ phases:
5762
5863
- |
5964
$env:Path = "C:\tools\cygwin\bin;$env:Path"
60-
cmd /c 'call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 && bash -c "make -C jbmc/regression test ; exit 0" '
65+
cmd /c 'call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 && bash -c "make -C jbmc/regression test" '
6166
6267
- |
6368
$env:Path = "C:\tools\cygwin\bin;$env:Path"
64-
cmd /c 'call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 && bash -c "make -C jbmc/unit test ; exit 0" '
69+
cmd /c 'call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 && bash -c "make -C jbmc/unit test" '
6570
6671
artifacts:
6772
files:

0 commit comments

Comments
 (0)