From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Tue, 23 Mar 2021 07:56:42 +0000 (+0100)
Subject: Travis enable all tests again.  Clang analyzer only a couple times, when
X-Git-Tag: release-1.13.2rc1~230
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e8fdd8650c6b74a2b4f0af8537ef2a43f05471d;p=thirdparty%2Funbound.git

Travis enable all tests again.  Clang analyzer only a couple times, when
there is a difference.  homebrew updates disabled, so it does not hang.
removed trailing slashes from configure paths.  Moved iOS tests to
allow-failure.
---

diff --git a/.travis.yml b/.travis.yml
index 0b1bae9d8..8931dd0d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,7 @@ addons:
       - openssl
       - libevent
       - expat
+    #homebrew hangs when updates are enabled. So it is kept off.
     #update: true
 
 jobs:
@@ -25,21 +26,21 @@ jobs:
       arch: amd64
       env:
         - CONFIG_OPTS="--enable-debug --disable-flto"
-        - TEST_ENABLED=yes
     - os: linux
       name: Clang on Linux, Amd64
       compiler: clang
       arch: amd64
       env:
         - CONFIG_OPTS="--enable-debug --disable-flto"
+        - TEST_ANALYZER=yes
     - os: osx
       name: Clang on OS X, Amd64
       compiler: clang
       arch: amd64
       env:
         - TEST_OSX=yes
-        - CONFIG_OPTS="--enable-debug --disable-flto --with-ssl=/usr/local/opt/openssl/"
-        - TEST_ENABLED=yes
+        - CONFIG_OPTS="--enable-debug --disable-flto --with-ssl=/usr/local/opt/openssl"
+        - TEST_ANALYZER=yes
     - os: linux
       name: Libevent, GCC on Linux, Amd64
       compiler: gcc
@@ -54,14 +55,15 @@ jobs:
       env:
         - TEST_LIBEVENT=yes
         - CONFIG_OPTS="--with-libevent"
-#    - os: osx
-#      name: Libevent, Clang on OS X, Amd64
-#      compiler: clang
-#      arch: amd64
-#      env:
-#        - TEST_OSX=yes
-#        - TEST_LIBEVENT=yes
-#        - CONFIG_OPTS="--with-ssl=/usr/local/opt/openssl/ --with-libevent=/usr/local/opt/libevent/"
+        - TEST_ANALYZER=yes
+    - os: osx
+      name: Libevent, Clang on OS X, Amd64
+      compiler: clang
+      arch: amd64
+      env:
+        - 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
@@ -132,90 +134,90 @@ jobs:
       dist: bionic
       env:
         - CONFIG_OPTS="--enable-debug --disable-flto"
-#    - os: osx
-#      osx_image: xcode10
-#      name: Apple iPhone on iOS, armv7
-#      compiler: clang
-#      env:
-#        - TEST_IOS=yes
-#        - AUTOTOOLS_HOST=armv7-apple-ios
-#        - OPENSSL_HOST=ios-cross
-#        - IOS_SDK=iPhoneOS
-#        - IOS_CPU=armv7s
-#        - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU"
-#    - os: osx
-#      osx_image: xcode10
-#      name: Apple iPhone on iOS, arm64
-#      compiler: clang
-#      env:
-#        - TEST_IOS=yes
-#        - AUTOTOOLS_HOST=aarch64-apple-ios
-#        - OPENSSL_HOST=ios64-cross
-#        - IOS_SDK=iPhoneOS
-#        - IOS_CPU=arm64
-#        - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU"
-#    - os: osx
-#      osx_image: xcode10
-#      name: Apple TV on iOS, arm64
-#      compiler: clang
-#      env:
-#        - TEST_IOS=yes
-#        - AUTOTOOLS_HOST=aarch64-apple-ios
-#        - OPENSSL_HOST=ios64-cross
-#        - IOS_SDK=AppleTVOS
-#        - IOS_CPU=arm64
-#        - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU"
-#    - os: osx
-#      osx_image: xcode10
-#      name: Apple Watch on iOS, armv7
-#      compiler: clang
-#      env:
-#        - TEST_IOS=yes
-#        - AUTOTOOLS_HOST=armv7-apple-ios
-#        - OPENSSL_HOST=ios-cross
-#        - IOS_SDK=WatchOS
-#        - IOS_CPU=armv7k
-#        - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU"
-#    - os: osx
-#      osx_image: xcode10
-#      name: iPhoneSimulator on OS X, i386
-#      env:
-#        - TEST_IOS=yes
-#        - AUTOTOOLS_HOST=i386-apple-ios
-#        - OPENSSL_HOST=iphoneos-cross
-#        - IOS_CPU=i386
-#        - IOS_SDK=iPhoneSimulator
-#        - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU"
-#    - os: osx
-#      osx_image: xcode10
-#      name: iPhoneSimulator on OS X, x86_64
-#      env:
-#        - TEST_IOS=yes
-#        - AUTOTOOLS_HOST=x86_64-apple-ios
-#        - OPENSSL_HOST=iphoneos-cross
-#        - IOS_CPU=x86_64
-#        - IOS_SDK=iPhoneSimulator
-#        - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU"
-#    - os: osx
-#      osx_image: xcode10
-#      name: AppleTVSimulator on OS X, x86_64
-#      env:
-#        - TEST_IOS=yes
-#        - AUTOTOOLS_HOST=x86_64-apple-ios
-#        - OPENSSL_HOST=iphoneos-cross
-#        - IOS_CPU=x86_64
-#        - IOS_SDK=AppleTVSimulator
-#        - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU"
-#    - os: osx
-#      osx_image: xcode10
-#      name: WatchSimulator on OS X, i386
-#      env:
-#        - TEST_IOS=yes
-#        - AUTOTOOLS_HOST=i386-apple-ios
-#        - OPENSSL_HOST=iphoneos-cross
-#        - IOS_CPU=i386
-#        - IOS_SDK=WatchSimulator
-#        - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU"
+    - os: osx
+      osx_image: xcode10
+      name: Apple iPhone on iOS, armv7
+      compiler: clang
+      env:
+        - TEST_IOS=yes
+        - AUTOTOOLS_HOST=armv7-apple-ios
+        - OPENSSL_HOST=ios-cross
+        - IOS_SDK=iPhoneOS
+        - IOS_CPU=armv7s
+        - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU"
+    - os: osx
+      osx_image: xcode10
+      name: Apple iPhone on iOS, arm64
+      compiler: clang
+      env:
+        - TEST_IOS=yes
+        - AUTOTOOLS_HOST=aarch64-apple-ios
+        - OPENSSL_HOST=ios64-cross
+        - IOS_SDK=iPhoneOS
+        - IOS_CPU=arm64
+        - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU"
+    - os: osx
+      osx_image: xcode10
+      name: Apple TV on iOS, arm64
+      compiler: clang
+      env:
+        - TEST_IOS=yes
+        - AUTOTOOLS_HOST=aarch64-apple-ios
+        - OPENSSL_HOST=ios64-cross
+        - IOS_SDK=AppleTVOS
+        - IOS_CPU=arm64
+        - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU"
+    - os: osx
+      osx_image: xcode10
+      name: Apple Watch on iOS, armv7
+      compiler: clang
+      env:
+        - TEST_IOS=yes
+        - AUTOTOOLS_HOST=armv7-apple-ios
+        - OPENSSL_HOST=ios-cross
+        - IOS_SDK=WatchOS
+        - IOS_CPU=armv7k
+        - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU"
+    - os: osx
+      osx_image: xcode10
+      name: iPhoneSimulator on OS X, i386
+      env:
+        - TEST_IOS=yes
+        - AUTOTOOLS_HOST=i386-apple-ios
+        - OPENSSL_HOST=iphoneos-cross
+        - IOS_CPU=i386
+        - IOS_SDK=iPhoneSimulator
+        - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU"
+    - os: osx
+      osx_image: xcode10
+      name: iPhoneSimulator on OS X, x86_64
+      env:
+        - TEST_IOS=yes
+        - AUTOTOOLS_HOST=x86_64-apple-ios
+        - OPENSSL_HOST=iphoneos-cross
+        - IOS_CPU=x86_64
+        - IOS_SDK=iPhoneSimulator
+        - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU"
+    - os: osx
+      osx_image: xcode10
+      name: AppleTVSimulator on OS X, x86_64
+      env:
+        - TEST_IOS=yes
+        - AUTOTOOLS_HOST=x86_64-apple-ios
+        - OPENSSL_HOST=iphoneos-cross
+        - IOS_CPU=x86_64
+        - IOS_SDK=AppleTVSimulator
+        - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU"
+    - os: osx
+      osx_image: xcode10
+      name: WatchSimulator on OS X, i386
+      env:
+        - TEST_IOS=yes
+        - AUTOTOOLS_HOST=i386-apple-ios
+        - OPENSSL_HOST=iphoneos-cross
+        - IOS_CPU=i386
+        - IOS_SDK=WatchSimulator
+        - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU"
     - os: linux
       name: Android armv7a, Linux, Amd64
       compiler: clang
@@ -274,6 +276,22 @@ jobs:
         - ANDROID_NDK_ROOT="$HOME/android-ndk"
 
   allow_failures:
+    - os: osx
+      name: Apple iPhone on iOS, armv7
+    - os: osx
+      name: Apple iPhone on iOS, arm64
+    - os: osx
+      name: Apple TV on iOS, arm64
+    - os: osx
+      name: Apple Watch on iOS, armv7
+    - os: osx
+      name: iPhoneSimulator on OS X, i386
+    - os: osx
+      name: iPhoneSimulator on OS X, x86_64
+    - os: osx
+      name: AppleTVSimulator on OS X, x86_64
+    - os: osx
+      name: WatchSimulator on OS X, i386
     - os: linux
       name: Android armv7a, Linux, Amd64
     - os: linux
@@ -296,7 +314,6 @@ before_script:
 # https://docs.travis-ci.com/user/job-lifecycle/ in the Travis docs.
 script:
   - |
-    if [ "$TEST_ENABLED" = "yes" ]; then
     if [ "$TEST_UBSAN" = "yes" ]; then
       export CFLAGS="-DNDEBUG -g2 -O3 -fsanitize=undefined -fno-sanitize-recover"
       ./configure
@@ -335,14 +352,17 @@ script:
       make -j 2
       make install
     elif [ "$TEST_OSX" = "yes" ]; then
-      ./configure --enable-debug --disable-flto --with-ssl=/usr/local/opt/openssl/
+      ./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)
+      if [ "$TEST_ANALYZER" = "yes" ]; then
+        (cd testdata/clang-analysis.tdir; bash clang-analysis.test)
+      fi
     else
       ./configure ${CONFIG_OPTS}
       make -j 2
       make test
-      (cd testdata/clang-analysis.tdir; bash clang-analysis.test)
-    fi
+      if [ "$TEST_ANALYZER" = "yes" ]; then
+        (cd testdata/clang-analysis.tdir; bash clang-analysis.test)
+      fi
     fi