diff options
author | Brent Cook <bcook@openbsd.org> | 2018-03-25 22:26:56 -0500 |
---|---|---|
committer | Brent Cook <bcook@openbsd.org> | 2018-03-25 22:26:56 -0500 |
commit | 0f0e25108079ff338dbd12acd676200290773993 (patch) | |
tree | 973d09cb29842f3e912f47f166641b716c3fb925 /scripts | |
parent | caeff2ee3778b6ea8aa33cc282b6481c557ae67e (diff) | |
parent | 55c0cacca0fe675a15389dc175088528a5d2cd00 (diff) | |
download | portable-0f0e25108079ff338dbd12acd676200290773993.tar.gz portable-0f0e25108079ff338dbd12acd676200290773993.tar.bz2 portable-0f0e25108079ff338dbd12acd676200290773993.zip |
Merge branch 'master' into OPENBSD_6_3
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/travis | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/scripts/travis b/scripts/travis index c8e67ce..ea54aae 100755 --- a/scripts/travis +++ b/scripts/travis | |||
@@ -12,20 +12,32 @@ if [ "x$ARCH" = "xnative" ]; then | |||
12 | make dist | 12 | make dist |
13 | tar zxvf libressl-*.tar.gz | 13 | tar zxvf libressl-*.tar.gz |
14 | cd libressl-* | 14 | cd libressl-* |
15 | mkdir build | 15 | mkdir build-static |
16 | cd build | 16 | mkdir build-shared |
17 | |||
18 | cd build-static | ||
17 | 19 | ||
18 | # test cmake and ninja | 20 | # test cmake and ninja |
19 | if [ `uname` = "Darwin" ]; then | 21 | if [ `uname` = "Darwin" ]; then |
20 | cmake .. | 22 | cmake .. |
21 | make | 23 | make |
22 | make test | 24 | make test |
25 | |||
26 | cd ../build-shared | ||
27 | cmake -DBUILD_SHARED_LIBS=ON .. | ||
28 | make | ||
29 | make test | ||
23 | else | 30 | else |
24 | sudo apt-get update | 31 | sudo apt-get update |
25 | sudo apt-get install -y cmake ninja-build | 32 | sudo apt-get install -y cmake ninja-build |
26 | cmake -GNinja .. | 33 | cmake -GNinja .. |
27 | ninja | 34 | ninja |
28 | ninja test | 35 | ninja test |
36 | |||
37 | cd ../build-shared | ||
38 | cmake -GNinja -DBUILD_SHARED_LIBS=ON .. | ||
39 | ninja | ||
40 | ninja test | ||
29 | fi | 41 | fi |
30 | else | 42 | else |
31 | CPU=i686 | 43 | CPU=i686 |