From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Thu, 19 Mar 2020 16:57:35 +0000 (+0100)
Subject: Merge branch 'libevent' of https://github.com/noloader/unbound into noloader-libevent
X-Git-Tag: release-1.11.0~92^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cf77d42556dd8d7ada5564b7174fc7a08f607fb;p=thirdparty%2Funbound.git

Merge branch 'libevent' of https://github.com/noloader/unbound into noloader-libevent
---

1cf77d42556dd8d7ada5564b7174fc7a08f607fb
diff --cc .travis.yml
index a22bbb8d3,4cc3dd8c1..9c6c1ac29
--- a/.travis.yml
+++ b/.travis.yml
@@@ -31,7 -34,27 +35,29 @@@ jobs
        name: Clang on OS X, Amd64
        compiler: clang
        arch: amd64
-       env: TEST_OSX=yes
+       env:
++        - TEST_OSX=yes
+         - CONFIG_OPTS="--enable-debug --disable-flto --with-ssl=/usr/local/opt/openssl/"
+     - os: linux
+       name: Libevent, GCC on Linux, Amd64
+       compiler: gcc
+       arch: amd64
+       env:
+         - TEST_LIBEVENT=yes
+         - CONFIG_OPTS="--with-libevent"
+     - os: linux
+       name: Libevent, Clang on Linux, Amd64
+       compiler: clang
+       arch: amd64
+         - TEST_LIBEVENT=yes
+         - CONFIG_OPTS="--with-libevent"
+     - os: osx
+       name: Libevent, Clang on OS X, Amd64
+       compiler: clang
+       arch: amd64
++        - TEST_OSX=yes
+         - TEST_LIBEVENT=yes
+         - CONFIG_OPTS="--with-ssl=/usr/local/opt/openssl/ --with-libevent=/usr/local/opt/libevent/"
      - os: linux
        name: UBsan, GCC on Linux, Amd64
        compiler: gcc
@@@ -86,9 -123,11 +126,11 @@@
        compiler: clang
        arch: s390x
        dist: bionic
+       env:
+         - CONFIG_OPTS="--enable-debug --disable-flto"
      - os: osx
        osx_image: xcode10
 -      name: Apple iPhone, OS X, Amd64
 +      name: Apple iPhone on iOS, armv7
        compiler: clang
        env:
          - TEST_IOS=yes
@@@ -287,13 -292,8 +329,13 @@@ script
          --with-libexpat="$ANDROID_PREFIX";
        make -j 2
        make install
 +    elif [ "$TEST_OSX" = "yes" ]; then
 +      ./configure --enable-debug --disable-flto --with-ssl=/usr/local/opt/openssl/
 +      make -j 2
 +      make test
 +      (cd testdata/clang-analysis.tdir; bash clang-analysis.test)
      else
-       ./configure --enable-debug --disable-flto
+       ./configure ${CONFIG_OPTS}
        make -j 2
        make test
        (cd testdata/clang-analysis.tdir; bash clang-analysis.test)