Sync with upstream

.travis.yml

@@ -10,6 +10,12 @@ addons:
     - libevent-dev
     - libexpat-dev
     - clang
+  homebrew:
+    packages:
+      - openssl
+      - libevent
+      - expat
+    update: true
 
 jobs:
   include:
@@ -25,6 +31,7 @@ jobs:
       name: Clang on OS X, Amd64
       compiler: clang
       arch: amd64
+      env: TEST_OSX=yes
     - os: linux
       name: UBsan, GCC on Linux, Amd64
       compiler: gcc
@@ -81,7 +88,7 @@ jobs:
       dist: bionic
     - os: osx
       osx_image: xcode10
-      name: Apple iPhone, OS X, Amd64
+      name: Apple iPhone on iOS, armv7
       compiler: clang
       env:
         - TEST_IOS=yes
@@ -89,10 +96,10 @@ jobs:
         - OPENSSL_HOST=ios-cross
         - IOS_SDK=iPhoneOS
         - IOS_CPU=armv7s
-        - IOS_PREFIX="$HOME/iPhoneOS-$IOS_CPU"
+        - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU"
     - os: osx
       osx_image: xcode10
-      name: Apple iPad, OS X, Amd64
+      name: Apple iPhone on iOS, arm64
       compiler: clang
       env:
         - TEST_IOS=yes
@@ -100,27 +107,69 @@ jobs:
         - OPENSSL_HOST=ios64-cross
         - IOS_SDK=iPhoneOS
         - IOS_CPU=arm64
-        - IOS_PREFIX="$HOME/iPhoneOS-$IOS_CPU"
+        - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU"
     - os: osx
       osx_image: xcode10
-      name: Apple TV, OS X, Amd64
+      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_PREFIX="$HOME/AppleTVOS"
+        - IOS_CPU=arm64
+        - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU"
     - os: osx
       osx_image: xcode10
-      name: Apple Watch, OS X, Amd64
+      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_PREFIX="$HOME/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
@@ -179,23 +228,23 @@ jobs:
         - ANDROID_NDK_ROOT="$HOME/android-ndk"
 
   allow_failures:
-    - os: osx
-      name: Apple TV, OS X, Amd64
-    - os: osx
-      name: Apple Watch, OS X, Amd64
     - os: linux
-      arch: amd64
       name: Android armv7a, Linux, Amd64
     - os: linux
-      arch: amd64
       name: Android aarch64, Linux, Amd64
     - os: linux
-      arch: amd64
       name: Android x86, Linux, Amd64
     - os: linux
-      arch: amd64
       name: Android x86_64, Linux, Amd64
 
+before_script:
+  - |
+    if [ "$TEST_ANDROID" = "yes" ]; then
+      ./contrib/android/install_tools.sh
+    elif [ "$TEST_IOS" = "yes" ]; then
+      ./contrib/ios/install_tools.sh
+    fi
+
 # The Travis docs say to avoid calling exit in the script. It leads to
 # some code duplication to avoid failures in cross-compiles. Also see
 # https://docs.travis-ci.com/user/job-lifecycle/ in the Travis docs.
@@ -215,7 +264,6 @@ script:
       export AUTOTOOLS_BUILD="$(./config.guess)"
       export PKG_CONFIG_PATH="$IOS_PREFIX/lib/pkgconfig"
       source ./contrib/ios/setenv_ios.sh
-      ./contrib/ios/install_tools.sh
       ./contrib/ios/install_openssl.sh
       ./contrib/ios/install_expat.sh
       ./configure \
@@ -230,7 +278,6 @@ script:
       export PKG_CONFIG_PATH="$ANDROID_PREFIX/lib/pkgconfig"
       ./contrib/android/install_ndk.sh
       source ./contrib/android/setenv_android.sh
-      ./contrib/android/install_tools.sh
       ./contrib/android/install_openssl.sh
       ./contrib/android/install_expat.sh
       ./configure \
@@ -240,7 +287,7 @@ script:
         --with-libexpat="$ANDROID_PREFIX";
       make -j 2
       make install
-    elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
+    elif [ "$TEST_OSX" = "yes" ]; then
       ./configure --enable-debug --disable-flto --with-ssl=/usr/local/opt/openssl/
       make -j 2
       make test