aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/cpprest
diff options
context:
space:
mode:
authorGianfranco Costamagna <costamagna.gianfranco@gmail.com>2020-02-27 15:37:25 +0100
committerKhem Raj <raj.khem@gmail.com>2020-02-27 08:25:49 -0800
commit40d3b71630acb985eed715142bcd17f4de287cad (patch)
tree90bcf01d4f16526b2fa250150ddcbdf3880ef64b /meta-oe/recipes-support/cpprest
parentd4874942d8d1a40fd84bbdb9528a58fd6289ca95 (diff)
downloadmeta-openembedded-40d3b71630acb985eed715142bcd17f4de287cad.tar.gz
cpprest: update to 2.10.15 and refresh patches
Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/cpprest')
-rw-r--r--meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch43
-rw-r--r--meta-oe/recipes-support/cpprest/cpprest_2.10.15.bb (renamed from meta-oe/recipes-support/cpprest/cpprest_2.10.14.bb)4
2 files changed, 8 insertions, 39 deletions
diff --git a/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch b/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch
index 5232e2a1d8..e108e0279d 100644
--- a/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch
+++ b/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch
@@ -54,7 +54,7 @@ Index: cpprest/Release/tests/functional/websockets/client/authentication_tests.c
===================================================================
--- cpprest.orig/Release/tests/functional/websockets/client/authentication_tests.cpp
+++ cpprest/Release/tests/functional/websockets/client/authentication_tests.cpp
-@@ -93,6 +93,7 @@
+@@ -93,6 +93,7 @@ SUITE(authentication_tests)
return false;
}
@@ -62,46 +62,15 @@ Index: cpprest/Release/tests/functional/websockets/client/authentication_tests.c
TEST(ssl_test)
{
websocket_client client;
-@@ -127,6 +128,7 @@
+@@ -127,6 +128,7 @@ SUITE(authentication_tests)
throw;
}
}
+ */
- // These tests are specific to our websocketpp based implementation.
- #if !defined(__cplusplus_winrt)
-@@ -159,12 +161,14 @@
- }
- }
-
-+ /*
- // 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.
-@@ -194,6 +198,7 @@
- }
- }
-
-+ /*
- // Winrt doesn't allow explicitly setting server host for SNI.
- TEST(sni_explicit_hostname)
- {
-@@ -204,6 +209,7 @@
- websocket_client client(config);
- sni_test_impl(client);
- }
-+ */
-
void handshake_error_test_impl(const ::utility::string_t& host)
{
-@@ -225,11 +231,11 @@
+@@ -148,11 +150,11 @@ SUITE(authentication_tests)
}
}
@@ -114,13 +83,13 @@ Index: cpprest/Release/tests/functional/websockets/client/authentication_tests.c
- TEST(cert_expired) { handshake_error_test_impl(U("wss://expired.badssl.com/")); }
+ //TEST(cert_expired) { handshake_error_test_impl(U("wss://expired.badssl.com/")); }
- #endif
+ } // SUITE(authentication_tests)
Index: cpprest/Release/tests/functional/http/client/connections_and_errors.cpp
===================================================================
--- cpprest.orig/Release/tests/functional/http/client/connections_and_errors.cpp
+++ cpprest/Release/tests/functional/http/client/connections_and_errors.cpp
-@@ -406,6 +406,7 @@
+@@ -408,6 +408,7 @@
}
#endif
@@ -128,7 +97,7 @@ Index: cpprest/Release/tests/functional/http/client/connections_and_errors.cpp
// Try to connect to a server on a closed port and cancel the operation.
TEST_FIXTURE(uri_address, cancel_bad_port)
{
-@@ -437,6 +438,7 @@
+@@ -439,6 +440,7 @@
VERIFY_THROWS_HTTP_ERROR_CODE(t.get(), std::errc::operation_canceled);
}
diff --git a/meta-oe/recipes-support/cpprest/cpprest_2.10.14.bb b/meta-oe/recipes-support/cpprest/cpprest_2.10.15.bb
index 11c8eab553..dee5ae2564 100644
--- a/meta-oe/recipes-support/cpprest/cpprest_2.10.14.bb
+++ b/meta-oe/recipes-support/cpprest/cpprest_2.10.15.bb
@@ -11,8 +11,8 @@ SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=maste
file://disable-float-tests.patch \
file://disable-outside-tests.patch "
-# tag 2.10.14
-SRCREV= "6f602bee67b088a299d7901534af3bce6334ab38"
+# tag 2.10.15
+SRCREV= "b94bc32ff84e815ba44c567f6fe4af5f5f6b3048"
S = "${WORKDIR}/git"