Travis, undo the && code and enable other iOS jobs.

diff --git a/.travis.yml b/.travis.yml
index b6f62223e25f3d477f4dfa5d1f6f8b5eb55c07ff..cc2937d20fe2a8797c853c4c4bb8f821840a5c38 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -137,18 +137,18 @@ 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"
-#        - HOMEBREW_NO_AUTO_UPDATE=1
+    - os: osx
+      osx_image: xcode12.2
+      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"
+        - HOMEBREW_NO_AUTO_UPDATE=1
     - os: osx
       osx_image: xcode12.2
       name: Apple iPhone on iOS, arm64
@@ -161,74 +161,74 @@ jobs:
         - IOS_CPU=arm64
         - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU"
         - HOMEBREW_NO_AUTO_UPDATE=1
-#    - 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"
-#        - HOMEBREW_NO_AUTO_UPDATE=1
-#    - 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"
-#        - HOMEBREW_NO_AUTO_UPDATE=1
-#    - 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"
-#        - HOMEBREW_NO_AUTO_UPDATE=1
-#    - 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"
-#        - HOMEBREW_NO_AUTO_UPDATE=1
-#    - 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"
-#        - HOMEBREW_NO_AUTO_UPDATE=1
-#    - 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"
-#        - HOMEBREW_NO_AUTO_UPDATE=1
+    - os: osx
+      osx_image: xcode12.2
+      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"
+        - HOMEBREW_NO_AUTO_UPDATE=1
+    - os: osx
+      osx_image: xcode12.2
+      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"
+        - HOMEBREW_NO_AUTO_UPDATE=1
+    - os: osx
+      osx_image: xcode12.2
+      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"
+        - HOMEBREW_NO_AUTO_UPDATE=1
+    - os: osx
+      osx_image: xcode12.2
+      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"
+        - HOMEBREW_NO_AUTO_UPDATE=1
+    - os: osx
+      osx_image: xcode12.2
+      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"
+        - HOMEBREW_NO_AUTO_UPDATE=1
+    - os: osx
+      osx_image: xcode12.2
+      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"
+        - HOMEBREW_NO_AUTO_UPDATE=1
     - os: linux
       name: Android armv7a, Linux, Amd64
       compiler: clang
@@ -287,22 +287,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, 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: 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
@@ -327,13 +327,13 @@ script:
   - |
     if [ "$TEST_UBSAN" = "yes" ]; then
       export CFLAGS="-DNDEBUG -g2 -O3 -fsanitize=undefined -fno-sanitize-recover"
-      ./configure && \
-      make -j 2 && \
+      ./configure
+      make -j 2
       make test
     elif [ "$TEST_ASAN" = "yes" ]; then
       export CFLAGS="-DNDEBUG -g2 -O3 -fsanitize=address"
-      ./configure && \
-      make -j 2 && \
+      ./configure
+      make -j 2
       make test
     elif [ "$TEST_IOS" = "yes" ]; then
       export AUTOTOOLS_BUILD="$(./config.guess)"
@@ -345,8 +345,8 @@ script:
         --build="$AUTOTOOLS_BUILD" --host="$AUTOTOOLS_HOST" \
         --prefix="$IOS_PREFIX" \
         --with-ssl="$IOS_PREFIX" --disable-gost \
-        --with-libexpat="$IOS_PREFIX"; && \
-      make -j 2 && \
+        --with-libexpat="$IOS_PREFIX";
+      make -j 2
       make install
     elif [ "$TEST_ANDROID" = "yes" ]; then
       export AUTOTOOLS_BUILD="$(./config.guess)"
@@ -359,20 +359,20 @@ script:
         --build="$AUTOTOOLS_BUILD" --host="$AUTOTOOLS_HOST" \
         --prefix="$ANDROID_PREFIX" \
         --with-ssl="$ANDROID_PREFIX" --disable-gost \
-        --with-libexpat="$ANDROID_PREFIX"; && \
-      make -j 2 && \
+        --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 && \
+      ./configure --enable-debug --disable-flto --with-ssl=/usr/local/opt/openssl
+      make -j 2
+      make 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 && \
+      ./configure ${CONFIG_OPTS}
+      make -j 2
+      make test
       if [ "$TEST_ANALYZER" = "yes" ]; then
         (cd testdata/clang-analysis.tdir; bash clang-analysis.test)
       fi