From 53d24e59db6c3d32d61a160fb0d8d91116bb12c2 Mon Sep 17 00:00:00 2001 From: Daniel Kroening Date: Sat, 30 Jun 2018 09:09:51 +0100 Subject: [PATCH 1/2] the jbmc tests now work on Windows --- appveyor.yml | 1 - buildspec-windows.yml | 11 ++++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c735dbc9aaf..e5c0d3efb33 100644 --- 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 index b746dfb6184..e342e85967c 100644 --- 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: From f795ef9bac74276fb58615613237a56ba5fbc01b Mon Sep 17 00:00:00 2001 From: Peter Schrammel Date: Tue, 17 Jul 2018 14:10:06 +0100 Subject: [PATCH 2/2] Remove trailing newlines that trip up regex on Windows --- jbmc/regression/jbmc-cover/generics/test.desc | 2 -- 1 file changed, 2 deletions(-) diff --git a/jbmc/regression/jbmc-cover/generics/test.desc b/jbmc/regression/jbmc-cover/generics/test.desc index c11972c0136..0fe333922c8 100644 --- 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 - -