From a23bff5eca51e176f35717430c128b45ad85205d Mon Sep 17 00:00:00 2001 From: Linus Probert Date: Fri, 11 May 2018 19:18:45 +0200 Subject: [PATCH] Hoefully test on appveyor and fix travis --- .appveyor.yml | 11 ++++++++++- .travis.yml | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 740d137..87b31a5 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -53,6 +53,14 @@ before_build: %DEPENDS% copy SDL2_mixer-2.0.2\%ARCH%\lib\*.a %PREFIX%\lib > nul %DEPENDS% copy SDL2_mixer-2.0.2\%ARCH%\bin\*.dll %PREFIX%\lib > nul + # CMocka + - |- + %DEPENDS% appveyor DownloadFile https://cmocka.org/files/1.1/cmocka-1.1.0-mingw.zip + %DEPENDS% 7z x cmocka-1.1.0-mingw.zip > nul + %DEPENDS% copy cmocka-1.1.0\include\* %PREFIX%\include > nul + %DEPENDS% copy cmocka-1.1.0\lib\*.a %PREFIX%\lib > nul + %DEPENDS% copy cmocka-1.1.0\bin\*.dll %PREFIX%\lib > nul + # Lua - |- - ps: | @@ -76,7 +84,8 @@ build_script: cmake -DCMAKE_PREFIX_PATH="%PREFIX%" -DCMAKE_C_COMPILER=mingw32-gcc.exe -DCMAKE_MAKE_PROGRAM=mingw32-make.exe -G "MinGW Makefiles" - |- - mingw32-make breakhack + mingw32-make + ctest -V mingw32-make package artifacts: diff --git a/.travis.yml b/.travis.yml index 5358180..afb058e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ before_install: install: - sudo apt-get install -y libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev - - sudo apt-get install -y cmake cmake-data lua5.2 liblua5.2-dev libcmocka-dev + - sudo apt-get install -y cmake cmake-data lua5.2 liblua5.2-dev libcmocka0 libcmocka-dev script: - mkdir build