From 5de4c4f0eb9bdcc1dbdadc4aafb4cc89083835a0 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Wed, 9 Sep 2015 06:12:16 -0500 Subject: add travis-ci cmake tests --- .travis.yml | 46 ++++++++++++++++++++++++++-------------------- scripts/travis | 12 ++++++++++++ 2 files changed, 38 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2fce9df..1a767b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,24 +1,30 @@ language: c matrix: - include: - - compiler: clang - os: osx - env: ARCH=native - - compiler: gcc - os: osx - env: ARCH=native - - compiler: clang - os: linux - env: ARCH=native - - compiler: gcc - os: linux - env: ARCH=native - - compiler: gcc - os: linux - env: ARCH=mingw32 - - compiler: gcc - os: linux - env: ARCH=mingw64 + include: + - compiler: clang + os: osx + env: ARCH=native + - compiler: gcc + os: osx + env: ARCH=native + - compiler: clang + os: linux + env: ARCH=native + - compiler: gcc + os: linux + env: ARCH=native + - compiler: gcc + os: linux + env: ARCH=mingw32 + - compiler: gcc + os: linux + env: ARCH=mingw64 script: - "./scripts/travis" + "./scripts/travis" + +addons: + apt: + packages: + - cmake + - ninja-build diff --git a/scripts/travis b/scripts/travis index 091f37d..82375cf 100755 --- a/scripts/travis +++ b/scripts/travis @@ -4,6 +4,7 @@ set -e ./autogen.sh if [ "x$ARCH" = "xnative" ]; then + # test autotools ./configure if [ `uname` = "Darwin" ]; then # OS X runs out of resources if we run 'make -j check' @@ -11,6 +12,17 @@ if [ "x$ARCH" = "xnative" ]; then else make -j distcheck fi + + # make distribution + make dist + tar zxvf libressl-*.tar.gz + cd libressl-* + + # test cmake and ninja + mkdir build + cd build + cmake -GNinja .. + ninja else CPU=i686 if [ "x$ARCH" = "xmingw64" ]; then -- cgit v1.2.3-55-g6feb