diff options
| author | Brent Cook <bcook@openbsd.org> | 2015-09-09 06:12:16 -0500 |
|---|---|---|
| committer | Brent Cook <bcook@openbsd.org> | 2015-09-09 06:12:16 -0500 |
| commit | 5de4c4f0eb9bdcc1dbdadc4aafb4cc89083835a0 (patch) | |
| tree | 3e7cff4ef7070893b7e38ec25e41bb2888992e7d | |
| parent | 5dc630371487d483a53f1ed7193ba8e8c73492a2 (diff) | |
| download | portable-5de4c4f0eb9bdcc1dbdadc4aafb4cc89083835a0.tar.gz portable-5de4c4f0eb9bdcc1dbdadc4aafb4cc89083835a0.tar.bz2 portable-5de4c4f0eb9bdcc1dbdadc4aafb4cc89083835a0.zip | |
add travis-ci cmake tests
| -rw-r--r-- | .travis.yml | 46 | ||||
| -rwxr-xr-x | 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 @@ | |||
| 1 | language: c | 1 | language: c |
| 2 | matrix: | 2 | matrix: |
| 3 | include: | 3 | include: |
| 4 | - compiler: clang | 4 | - compiler: clang |
| 5 | os: osx | 5 | os: osx |
| 6 | env: ARCH=native | 6 | env: ARCH=native |
| 7 | - compiler: gcc | 7 | - compiler: gcc |
| 8 | os: osx | 8 | os: osx |
| 9 | env: ARCH=native | 9 | env: ARCH=native |
| 10 | - compiler: clang | 10 | - compiler: clang |
| 11 | os: linux | 11 | os: linux |
| 12 | env: ARCH=native | 12 | env: ARCH=native |
| 13 | - compiler: gcc | 13 | - compiler: gcc |
| 14 | os: linux | 14 | os: linux |
| 15 | env: ARCH=native | 15 | env: ARCH=native |
| 16 | - compiler: gcc | 16 | - compiler: gcc |
| 17 | os: linux | 17 | os: linux |
| 18 | env: ARCH=mingw32 | 18 | env: ARCH=mingw32 |
| 19 | - compiler: gcc | 19 | - compiler: gcc |
| 20 | os: linux | 20 | os: linux |
| 21 | env: ARCH=mingw64 | 21 | env: ARCH=mingw64 |
| 22 | 22 | ||
| 23 | script: | 23 | script: |
| 24 | "./scripts/travis" | 24 | "./scripts/travis" |
| 25 | |||
| 26 | addons: | ||
| 27 | apt: | ||
| 28 | packages: | ||
| 29 | - cmake | ||
| 30 | - 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 | |||
| 4 | ./autogen.sh | 4 | ./autogen.sh |
| 5 | 5 | ||
| 6 | if [ "x$ARCH" = "xnative" ]; then | 6 | if [ "x$ARCH" = "xnative" ]; then |
| 7 | # test autotools | ||
| 7 | ./configure | 8 | ./configure |
| 8 | if [ `uname` = "Darwin" ]; then | 9 | if [ `uname` = "Darwin" ]; then |
| 9 | # OS X runs out of resources if we run 'make -j check' | 10 | # OS X runs out of resources if we run 'make -j check' |
| @@ -11,6 +12,17 @@ if [ "x$ARCH" = "xnative" ]; then | |||
| 11 | else | 12 | else |
| 12 | make -j distcheck | 13 | make -j distcheck |
| 13 | fi | 14 | fi |
| 15 | |||
| 16 | # make distribution | ||
| 17 | make dist | ||
| 18 | tar zxvf libressl-*.tar.gz | ||
| 19 | cd libressl-* | ||
| 20 | |||
| 21 | # test cmake and ninja | ||
| 22 | mkdir build | ||
| 23 | cd build | ||
| 24 | cmake -GNinja .. | ||
| 25 | ninja | ||
| 14 | else | 26 | else |
| 15 | CPU=i686 | 27 | CPU=i686 |
| 16 | if [ "x$ARCH" = "xmingw64" ]; then | 28 | if [ "x$ARCH" = "xmingw64" ]; then |