Update vcpkg and remove tests that look for web servers that no longer exist (#1293)

BillyONeal · web-flow · commit c9f91156e34a · 2019-12-18T13:41:42.000-08:00
diff --git a/Build_android/configure.sh b/Build_android/configure.sh
@@ -155,7 +155,7 @@ if [ "${DO_OPENSSL}" == "1" ]; then (
 if [ "${DO_BOOST}" == "1" ]; then (
     if [ ! -d 'Boost-for-Android' ]; then git clone https://github.com/moritz-wundke/Boost-for-Android; fi
     cd Boost-for-Android
-    git checkout aed656a97fb3af7322fd2c3da5995a2d09d87d4b
+    git checkout 245ea53385a55742a9ab08a8bd32c6a2dc0bbea4
     PATH="$PATH:$NDK_DIR" \
     CXXFLAGS="-std=gnu++11" \
     ./build-android.sh \
diff --git a/Build_iOS/configure.sh b/Build_iOS/configure.sh
@@ -96,7 +96,7 @@ if [ ! -e $ABS_PATH/boost.framework ] && [ ! -d $ABS_PATH/boost ]; then
         git clone https://github.com/faithfracture/Apple-Boost-BuildScript ${ABS_PATH}/Apple-Boost-BuildScript
     fi
     pushd ${ABS_PATH}/Apple-Boost-BuildScript
-    git checkout 1ebe6e7654d9c9e1792076ee3827a45d5d2f34c5
+    git checkout 8c42427b4ebc7865eb99b0a0b9607888af2c6abc
     BOOST_LIBS="thread chrono filesystem regex system random" ./boost.sh -ios -tvos --boost-version $BOOST_VERSION
     popd
     mv ${ABS_PATH}/Apple-Boost-BuildScript/build/boost/${BOOST_VERSION}/ios/framework/boost.framework ${ABS_PATH}
@@ -112,7 +112,7 @@ if [ ! -e ${ABS_PATH}/openssl/lib/libcrypto.a ]; then
        git clone --depth=1 https://github.com/x2on/OpenSSL-for-iPhone.git ${ABS_PATH}/OpenSSL-for-iPhone
     fi
     pushd ${ABS_PATH}/OpenSSL-for-iPhone
-    git checkout 10019638e80e8a8a5fc19642a840d8a69fac7349
+    git checkout 6c665e2a15ba7e834875eecaf4eb93c11605dd9a
     ./build-libssl.sh --version=${OPENSSL_VERSION}
     popd
     mkdir -p ${ABS_PATH}/openssl/lib
diff --git a/Release/tests/functional/websockets/client/authentication_tests.cpp b/Release/tests/functional/websockets/client/authentication_tests.cpp
@@ -128,83 +128,6 @@ SUITE(authentication_tests)
         }
     }
 
-// These tests are specific to our websocketpp based implementation.
-#if !defined(__cplusplus_winrt)
-
-    void sni_test_impl(websocket_client & client)
-    {
-        try
-        {
-            client.connect(U("wss://swordsoftruth.com")).wait();
-
-            // Should never be reached.
-            VERIFY_IS_TRUE(false);
-        }
-        catch (const websocket_exception& e)
-        {
-            if (is_timeout(e.what()))
-            {
-                // Since this test depends on an outside server sometimes it sporadically can fail due to timeouts
-                // especially on our build machines.
-                return;
-            }
-
-            // This test just covers establishing the TLS connection and verifying
-            // the server certificate, expect it to return an unexpected HTTP status code.
-            if (e.error_code().value() == 20)
-            {
-                return;
-            }
-            throw;
-        }
-    }
-
-    // Test specifically for server SignalR team hit interesting cases with.
-    TEST(sni_with_older_server_test)
-    {
-        websocket_client client;
-        sni_test_impl(client);
-    }
-
-    // WinRT doesn't expose option for disabling.
-    // No stable server is available to reliably test this.
-    // The configuration below relies on a timeout in the success case.
-    TEST(disable_sni, "Ignore", "Manual")
-    {
-        websocket_client_config config;
-        config.set_server_name("expired.badssl.com");
-        config.disable_sni();
-        websocket_client client(config);
-
-        try
-        {
-            client.connect(U("wss://badssl.com")).wait();
-
-            // Should never be reached.
-            VERIFY_IS_TRUE(false);
-        }
-        catch (const websocket_exception& e)
-        {
-            // Should fail for a reason different than invalid HTTP status.
-            if (e.error_code().value() != 20)
-            {
-                return;
-            }
-            throw;
-        }
-    }
-
-    // Winrt doesn't allow explicitly setting server host for SNI.
-    TEST(sni_explicit_hostname)
-    {
-        websocket_client_config config;
-        const auto& name = utf8string("swordsoftruth.com");
-        config.set_server_name(name);
-        VERIFY_ARE_EQUAL(name, config.server_name());
-        websocket_client client(config);
-        sni_test_impl(client);
-    }
-
     void handshake_error_test_impl(const ::utility::string_t& host)
     {
         websocket_client client;
@@ -231,8 +154,6 @@ SUITE(authentication_tests)
 
     TEST(cert_expired) { handshake_error_test_impl(U("wss://expired.badssl.com/")); }
 
-#endif
-
 } // SUITE(authentication_tests)
 
 } // namespace client
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -124,10 +124,9 @@ jobs:
         export NCPU=2
         ../configure.sh --ndk /usr/local/lib/android/sdk/ndk-bundle
       displayName: 'Build for Android'
-  # Homebrew is disabled for now because it apparently is deploying a Boost version that the version of xcode deployed in Pipelines cannot build.
   # - job: MacOS_Homebrew
   #   pool:
-  #     vmImage: 'macOS-10.14'
+  #     vmImage: 'macOS-latest'
   #   steps:
   #   - script: brew install boost openssl ninja
   #     displayName: Brew install dependencies
@@ -168,47 +167,45 @@ jobs:
   #       cd build.release.static
   #       ninja
   #     displayName: 'Run ninja, release static'
-  - job: MacOS_Vcpkg
-    pool:
-      vmImage: 'macOS-10.14'
-    steps:
-    - script: |
-        brew install gcc ninja
-        ./vcpkg/bootstrap-vcpkg.sh
-        ./vcpkg/vcpkg install zlib openssl boost-system boost-date-time boost-regex websocketpp boost-thread boost-filesystem boost-random boost-chrono boost-interprocess brotli --vcpkg-root ./vcpkg
-      displayName: Vcpkg install dependencies
-    - script: |
-        mkdir build.debug
-        mkdir build.release
-      displayName: Make Build Directories
-    - task: CMake@1
-      inputs:
-        workingDirectory: 'build.debug'
-        cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..'
-    - task: CMake@1
-      inputs:
-        workingDirectory: 'build.release'
-        cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..'
-    - script: |
-        cd build.debug
-        ninja
-      displayName: 'Run ninja debug'
-    - script: |
-        cd build.debug/Release/Binaries
-        ./test_runner *test.dylib
-      displayName: 'Run Tests debug'
-    - script: |
-        cd build.release
-        ninja
-      displayName: 'Run ninja, release'
-    - script: |
-        cd build.release/Release/Binaries
-        ./test_runner *test.dylib
-      displayName: 'Run tests, release'
-  # iOS is disabled for now because the dependency Apple-Boost-BuildScript appears to be broken with the version of XCode in use in Pipelines.
+  # - job: MacOS_Vcpkg
+  #   pool:
+  #     vmImage: 'macOS-latest'
+  #   steps:
+  #   - script: |
+  #       ./vcpkg/bootstrap-vcpkg.sh
+  #       ./vcpkg/vcpkg install zlib openssl boost-system boost-date-time boost-regex websocketpp boost-thread boost-filesystem boost-random boost-chrono boost-interprocess brotli --vcpkg-root ./vcpkg
+  #     displayName: Vcpkg install dependencies
+  #   - script: |
+  #       mkdir build.debug
+  #       mkdir build.release
+  #     displayName: Make Build Directories
+  #   - task: CMake@1
+  #     inputs:
+  #       workingDirectory: 'build.debug'
+  #       cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..'
+  #   - task: CMake@1
+  #     inputs:
+  #       workingDirectory: 'build.release'
+  #       cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..'
+  #   - script: |
+  #       cd build.debug
+  #       ninja
+  #     displayName: 'Run ninja debug'
+  #   - script: |
+  #       cd build.debug/Release/Binaries
+  #       ./test_runner *test.dylib
+  #     displayName: 'Run Tests debug'
+  #   - script: |
+  #       cd build.release
+  #       ninja
+  #     displayName: 'Run ninja, release'
+  #   - script: |
+  #       cd build.release/Release/Binaries
+  #       ./test_runner *test.dylib
+  #     displayName: 'Run tests, release'
   # - job: MacOS_iOS
   #   pool:
-  #     vmImage: 'macOS-10.14'
+  #     vmImage: 'macOS-latest'
   #   steps:
   #   - script: |
   #       cd Build_iOS
diff --git a/vcpkg b/vcpkg
@@ -1 +1 @@
-Subproject commit ee0bfad1cfa11e048823e2d02d9f619db7d94a3f
+Subproject commit 43fa3e60cfb96fa42940d234b011514c8be92256
