diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-08-31 07:59:24 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-09-04 07:38:30 +0200 |
| commit | 6b8280f6a903880a6dce3b1a41f962fac84e482f (patch) | |
| tree | 4964b7cd142ebdb014b2372bd6fa666c70f65281 /.travis.yml | |
| parent | e01f7f2c6dccad7a950c1af4c31737a9628e809e (diff) | |
| download | NetworkManager-6b8280f6a903880a6dce3b1a41f962fac84e482f.tar.gz | |
build/travis: build both against crypto "gnutls" and "nss"
We already do matrix-builds with autotools|meson and gcc|clang.
Make the selected crypto backend depending on the compiler, so
that we get more coverage.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index bba6844210..c5108aee11 100644 --- a/.travis.yml +++ b/.travis.yml @@ -79,6 +79,11 @@ before_install: script: - | if test "$BUILD_TYPE" == 'meson'; then + if [ "$CC" == gcc ]; then + CRYPTO=nss + else + CRYPTO=gnutls + fi && meson build \ \ -D ld_gc=false \ @@ -91,6 +96,7 @@ script: -D vapi=false \ -D introspection=false \ -D qt=false \ + -D crypto=$CRYPTO \ \ -D docs=true \ \ @@ -103,11 +109,16 @@ script: fi - | if test "$BUILD_TYPE" == 'autotools'; then + if [ "$CC" == gcc ]; then + CRYPTO=gnutls + else + CRYPTO=nss + fi && git clean -fdx && NOCONFIGURE=1 ./autogen.sh && mkdir ./build && pushd ./build && - ../configure --prefix="$PWD/INST" --with-systemd-logind=no --enable-more-warnings=no --enable-ifcfg-rh --enable-config-plugin-ibft --enable-ifupdown --enable-tests && + ../configure --prefix="$PWD/INST" --with-systemd-logind=no --enable-more-warnings=no --enable-ifcfg-rh --enable-config-plugin-ibft --enable-ifupdown --enable-tests --with-crypto=$CRYPTO && make -j4 && if [ "$CC" == gcc ]; then sudo locale-gen pl_PL.UTF-8 && |