Skip to content

the jbmc tests now work on Windows #2495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 19, 2018
Merged

the jbmc tests now work on Windows #2495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53d24e5
the jbmc tests now work on Windows
Jun 30, 2018
f795ef9
Remove trailing newlines that trip up regex on Windows
peterschrammel Jul 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 8 additions & 3 deletions buildspec-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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"
Expand All @@ -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:
Expand Down
2 changes: 0 additions & 2 deletions jbmc/regression/jbmc-cover/generics/test.desc
View file
Open in desktop
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