From 0e691e76dbd928b4aa919cbb9788c805e34937dc Mon Sep 17 00:00:00 2001 From: Evan Mallory Date: Thu, 22 Sep 2016 18:51:10 -0400 Subject: Fix test harness to work with msys2 With this change, 97% of the tests pass. See the build on appveyor for more info: https://ci.appveyor.com/project/Evan/ledger/build/build-49 I'll follow up with another PR to fix some of the remaining broken tests --- appveyor.yml | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'appveyor.yml') diff --git a/appveyor.yml b/appveyor.yml index c44dfeb3..94a4fe0f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,13 +16,29 @@ build_script: - C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -S mingw-w64-i686-boost" - C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -S mingw-w64-i686-mpfr" - C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -S mingw-w64-i686-cmake" -- C:\msys64\usr\bin\bash -lc "export PATH=/mingw32/bin:$PATH && cd $APPVEYOR_BUILD_FOLDER && cmake -G 'MSYS Makefiles'" -- C:\msys64\usr\bin\bash -lc "export PATH=/mingw32/bin:$PATH && cd $APPVEYOR_BUILD_FOLDER && make -j2" +- C:\msys64\usr\bin\bash -lc "export PATH=/mingw32/bin:$PATH && cd $APPVEYOR_BUILD_FOLDER && + cmake -G 'MSYS Makefiles'" +- C:\msys64\usr\bin\bash -lc "export PATH=/mingw32/bin:$PATH && cd $APPVEYOR_BUILD_FOLDER && + make -j2" after_build: - set LIB_DIR=C:\msys64\mingw32\bin -- 7z a ledger-win.zip %APPVEYOR_BUILD_FOLDER%\ledger.exe %LIB_DIR%\libboost_filesystem-mt.dll %LIB_DIR%\libboost_regex-mt.dll %LIB_DIR%\libboost_system-mt.dll %LIB_DIR%\libgcc_s_dw2-1.dll %LIB_DIR%\libgmp-10.dll %LIB_DIR%\libicudt57.dll %LIB_DIR%\libicuuc57.dll %APPVEYOR_BUILD_FOLDER%\libledger.dll %LIB_DIR%\libstdc++-6.dll %LIB_DIR%\libwinpthread-1.dll +- 7z a ledger-win.zip %APPVEYOR_BUILD_FOLDER%\ledger.exe + %LIB_DIR%\libboost_filesystem-mt.dll + %LIB_DIR%\libboost_regex-mt.dll + %LIB_DIR%\libboost_system-mt.dll + %LIB_DIR%\libgcc_s_dw2-1.dll + %LIB_DIR%\libgmp-10.dll + %LIB_DIR%\libicudt57.dll + %LIB_DIR%\libicuuc57.dll + %LIB_DIR%\libstdc++-6.dll + %LIB_DIR%\libwinpthread-1.dll + %APPVEYOR_BUILD_FOLDER%\libledger.dll artifacts: - path: ledger-win.zip name: Ledger Win32 binaries + +test_script: +- C:\msys64\usr\bin\bash -lc "export MINGW_PREFIX=C:/msys64/mingw32/ CTEST_OUTPUT_ON_FAILURE=1 + PATH=/mingw32/bin:$PATH && cd $APPVEYOR_BUILD_FOLDER && make test" -- cgit v1.2.3