From 9f6f0818c7c528348d38c09003a69a62938f51ab Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 31 Mar 2016 12:48:22 +0530 Subject: [PATCH 1/2] Travis test on osx, linux, gcc and clang --- .travis.yml | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4db05e61..79881443 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,19 @@ language: c -before_install: - - sudo apt-get update -qq - - sudo apt-get install -qq texinfo +sudo: false +os: + - osx + - linux +compiler: + - gcc + - clang +addons: + apt: + packages: + - texinfo script: + - if [[ "${TRAVIS_OS_NAME}" == "osx" ]] && [[ "${CC}" == "gcc" ]]; then + export CC=gcc-4.8; + export CXX=g++-4.8; + fi + - $CC --version - ./configure && make && make check - From 947fb0832ccc76de44c48b8d9909365c7836e839 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 31 Mar 2016 16:02:59 +0530 Subject: [PATCH 2/2] Appveyor for windows CI --- .appveyor_msys_build.sh | 5 +++++ appveyor.yml | 31 +++++++++++++++++++++++++++++++ build.vc14/msbuild.bat | 3 +-- 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 .appveyor_msys_build.sh create mode 100644 appveyor.yml diff --git a/.appveyor_msys_build.sh b/.appveyor_msys_build.sh new file mode 100644 index 00000000..8da330a8 --- /dev/null +++ b/.appveyor_msys_build.sh @@ -0,0 +1,5 @@ +export PATH=/c/msys64/mingw$ABI/bin:$PATH +cd /c/projects/mpir +./configure ABI=$ABI +make +make check diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 00000000..cf3ea2e2 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,31 @@ +version: 1.0.{build} +build: + verbosity: minimal + +environment: + matrix: + - BUILD_TYPE: Release + COMPILER: MSVC15 + PLATFORM: x64 + - BUILD_TYPE: Release + COMPILER: MSVC15 + PLATFORM: Win32 + - COMPILER: MinGW-w64 + ABI: 64 + - COMPILER: MinGW-w64 + ABI: 32 + - BUILD_TYPE: Debug + COMPILER: MSVC15 + PLATFORM: x64 + - BUILD_TYPE: Debug + COMPILER: MSVC15 + PLATFORM: Win32 + +build_script: + - if [%COMPILER%]==[MinGW-w64] C:\msys64\usr\bin\sh.exe --login /c/projects/mpir/.appveyor_msys_build.sh + - if [%COMPILER%]==[MSVC15] cd build.vc14 + - if [%COMPILER%]==[MSVC15] msbuild.bat gc lib %PLATFORM% %BUILD_TYPE% +tests + +test_script: + - if [%COMPILER%]==[MSVC15] cd mpir-tests + - if [%COMPILER%]==[MSVC15] python %cd%\run-tests.py 0 diff --git a/build.vc14/msbuild.bat b/build.vc14/msbuild.bat index dbc6b96a..58229f21 100644 --- a/build.vc14/msbuild.bat +++ b/build.vc14/msbuild.bat @@ -30,8 +30,7 @@ if /i "%libp%" == "LIB" ( ) if /i "%5" EQU "+tests" ( - set TESTDIR=.\mpir-tests\ - for /d %%d in (%TESTDIR%*) do ( + for /d %%d in (mpir-tests\*) do ( for %%f in (%%d\*.vcxproj) do ( %msbdir%\msbuild.exe /property:SolutionDir=..\..\ /property:OutDir=..\..\%plat%\%conf%\ /p:Platform=%plat% /p:Configuration=%conf% %%f )