summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGianfranco Costamagna <costamagna.gianfranco@gmail.com>2019-01-21 12:40:34 +0100
committerKhem Raj <raj.khem@gmail.com>2019-01-22 00:54:02 -0800
commit6ceb78f3f0aedc6c97146e14a1fbe8fd04c48431 (patch)
tree0411002d4f595a0e26211189747199e289b5af0d
parentc36ccaf595fee481a1c42cb409baf7c9d39851ff (diff)
downloadmeta-openembedded-6ceb78f3f0aedc6c97146e14a1fbe8fd04c48431.tar.gz
cpprest: update to 2.10.9, drop patches
drop patches, now useless in this version. Seems like with both Ubuntu, Debian and Yocto builds that network is not accessed anymore with this upstream release. Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-support/cpprest/cpprest/disable-float-tests.patch25
-rw-r--r--meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch142
-rw-r--r--meta-oe/recipes-support/cpprest/cpprest/disable-test-timeouts.patch103
-rw-r--r--meta-oe/recipes-support/cpprest/cpprest_2.10.9.bb (renamed from meta-oe/recipes-support/cpprest/cpprest_2.10.8.bb)7
4 files changed, 2 insertions, 275 deletions
diff --git a/meta-oe/recipes-support/cpprest/cpprest/disable-float-tests.patch b/meta-oe/recipes-support/cpprest/cpprest/disable-float-tests.patch
deleted file mode 100644
index 75f74ec658..0000000000
--- a/meta-oe/recipes-support/cpprest/cpprest/disable-float-tests.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1Description: new toolchain might have increased the float precision
2Author: Gianfranco Costamagna <locutusofborg@debian.org>
3Last-Update: 2017-10-28
4Forwarded: https://github.com/Microsoft/cpprestsdk/issues/576
5
6--- casablanca-2.10.0.orig/Release/tests/functional/streams/istream_tests.cpp
7+++ casablanca-2.10.0/Release/tests/functional/streams/istream_tests.cpp
8@@ -1302,7 +1302,7 @@ void compare_float(float expected, float
9 {
10 compare_floating(expected, actual, FLT_EPSILON);
11 }
12-
13+/*
14 TEST(extract_floating_point)
15 {
16 std::string test_string;
17@@ -1349,7 +1349,7 @@ TEST(extract_floating_point)
18 VERIFY_ARE_EQUAL(1 / expected, 1 / actual);
19 } while (!std_istream.eof());
20 }
21-
22+*/
23 TEST(extract_floating_point_with_exceptions)
24 {
25 std::vector<std::pair<std::string, std::string>> tests;
diff --git a/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch b/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch
deleted file mode 100644
index 2dff0d97c7..0000000000
--- a/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch
+++ /dev/null
@@ -1,142 +0,0 @@
1Description: Debian forbids calls to external websites.
2
3Author: Gianfranco Costamagna <locutus@debian.org>
4Origin: Debian
5Forwarded: not-needed
6Reviewed-By: Gianfranco Costamagna <locutusofborg@debian.org>
7Last-Update: 2015-11-25
8
9Index: casablanca/Release/tests/functional/http/client/CMakeLists.txt
10===================================================================
11--- casablanca.orig/Release/tests/functional/http/client/CMakeLists.txt
12+++ casablanca/Release/tests/functional/http/client/CMakeLists.txt
13@@ -12,7 +12,6 @@
14 multiple_requests.cpp
15 oauth1_tests.cpp
16 oauth2_tests.cpp
17- outside_tests.cpp
18 pipeline_stage_tests.cpp
19 progress_handler_tests.cpp
20 proxy_tests.cpp
21Index: casablanca/Release/tests/functional/http/client/authentication_tests.cpp
22===================================================================
23--- casablanca.orig/Release/tests/functional/http/client/authentication_tests.cpp
24+++ casablanca/Release/tests/functional/http/client/authentication_tests.cpp
25@@ -663,15 +663,19 @@
26 VERIFY_ARE_EQUAL(return_code, response.status_code());
27 }
28
29+/*
30 TEST(auth_no_data)
31 {
32 auth_test_impl(false);
33 }
34+*/
35
36+/*
37 TEST(unsuccessful_auth_with_basic_cred)
38 {
39 auth_test_impl(true);
40 }
41+*/
42
43 TEST_FIXTURE(uri_address, set_user_options_asio_http)
44 {
45@@ -692,7 +696,7 @@
46 auto response = client.request(methods::GET).get();
47 VERIFY_ARE_EQUAL(200, response.status_code());
48 }
49-
50+/*
51 TEST_FIXTURE(uri_address, set_user_options_asio_https)
52 {
53 handle_timeout([]
54@@ -714,7 +718,7 @@
55 VERIFY_IS_FALSE(v.empty());
56 });
57 }
58-
59+*/
60 #endif
61
62 } // SUITE(authentication_tests)
63Index: casablanca/Release/tests/functional/websockets/client/authentication_tests.cpp
64===================================================================
65--- casablanca.orig/Release/tests/functional/websockets/client/authentication_tests.cpp
66+++ casablanca/Release/tests/functional/websockets/client/authentication_tests.cpp
67@@ -86,7 +86,7 @@
68 }
69 return false;
70 }
71-
72+/*
73 TEST(ssl_test)
74 {
75 websocket_client client;
76@@ -122,7 +122,7 @@
77 throw;
78 }
79 }
80-
81+*/
82 // These tests are specific to our websocketpp based implementation.
83 #if !defined(__cplusplus_winrt)
84
85@@ -153,14 +153,15 @@
86 throw;
87 }
88 }
89-
90+/*
91 // Test specifically for server SignalR team hit interesting cases with.
92 TEST(sni_with_older_server_test)
93 {
94 websocket_client client;
95 sni_test_impl(client);
96 }
97-
98+*/
99+/*
100 // WinRT doesn't expose option for disabling.
101 // No stable server is available to reliably test this.
102 // The configuration below relies on a timeout in the success case.
103@@ -188,7 +189,8 @@
104 throw;
105 }
106 }
107-
108+*/
109+/*
110 // Winrt doesn't allow explicitly setting server host for SNI.
111 TEST(sni_explicit_hostname)
112 {
113@@ -199,7 +201,7 @@
114 websocket_client client(config);
115 sni_test_impl(client);
116 }
117-
118+*/
119 void handshake_error_test_impl(const ::utility::string_t &host)
120 {
121 websocket_client client;
122Index: casablanca/Release/tests/functional/http/client/connections_and_errors.cpp
123===================================================================
124--- casablanca.orig/Release/tests/functional/http/client/connections_and_errors.cpp
125+++ casablanca/Release/tests/functional/http/client/connections_and_errors.cpp
126@@ -415,6 +415,7 @@
127 }
128 #endif
129
130+/*
131 // Try to connect to a server on a closed port and cancel the operation.
132 TEST_FIXTURE(uri_address, cancel_bad_port)
133 {
134@@ -446,7 +447,7 @@
135
136 VERIFY_THROWS_HTTP_ERROR_CODE(t.get(), std::errc::operation_canceled);
137 }
138-
139+*/
140 } // SUITE(connections_and_errors)
141
142 }}}}
diff --git a/meta-oe/recipes-support/cpprest/cpprest/disable-test-timeouts.patch b/meta-oe/recipes-support/cpprest/cpprest/disable-test-timeouts.patch
deleted file mode 100644
index 93c3e8a269..0000000000
--- a/meta-oe/recipes-support/cpprest/cpprest/disable-test-timeouts.patch
+++ /dev/null
@@ -1,103 +0,0 @@
1Description: Some tests takes too long on slow architectures and timeouts
2 We can safely disable them.
3 e.g.
4 Release/tests/functional/http/client/connections_and_errors.cpp:142: error: Failure in request_timeout_microsecond: Test case timed out and is hung. Aborting all remaining test cases. Expected under 180000ms. FAILED
5
6Index: casablanca/Release/tests/functional/http/client/connections_and_errors.cpp
7===================================================================
8--- casablanca.orig/Release/tests/functional/http/client/connections_and_errors.cpp
9+++ casablanca/Release/tests/functional/http/client/connections_and_errors.cpp
10@@ -127,7 +127,7 @@
11 // Try sending another request.
12 VERIFY_THROWS(client.request(methods::GET).wait(), web::http::http_exception);
13 }
14-
15+/*
16 TEST_FIXTURE(uri_address, request_timeout)
17 {
18 test_http_server::scoped_server scoped(m_uri);
19@@ -146,7 +146,8 @@
20 #endif
21 t.get();
22 }
23-
24+*/
25+/*
26 TEST_FIXTURE(uri_address, request_timeout_microsecond)
27 {
28 pplx::task<test_request*> t;
29@@ -168,7 +169,7 @@
30 try { t.get(); }
31 catch (...) {}
32 }
33-
34+*/
35 TEST_FIXTURE(uri_address, invalid_method)
36 {
37 web::http::uri uri(U("http://www.bing.com/"));
38Index: casablanca/Release/tests/functional/http/listener/requests_tests.cpp
39===================================================================
40--- casablanca.orig/Release/tests/functional/http/listener/requests_tests.cpp
41+++ casablanca/Release/tests/functional/http/listener/requests_tests.cpp
42@@ -173,7 +173,7 @@
43
44 listener.close().wait();
45 }
46-
47+/*
48 TEST_FIXTURE(uri_address, response_order)
49 {
50 http_listener listener(m_uri);
51@@ -217,7 +217,7 @@
52
53 listener.close().wait();
54 }
55-
56+*/
57 TEST_FIXTURE(uri_address, uri_encoding, "Ignore", "Codeplex 201")
58 {
59 http_listener listener(m_uri);
60Index: casablanca/Release/tests/functional/websockets/client/authentication_tests.cpp
61===================================================================
62--- casablanca.orig/Release/tests/functional/websockets/client/authentication_tests.cpp
63+++ casablanca/Release/tests/functional/websockets/client/authentication_tests.cpp
64@@ -221,7 +221,7 @@
65 VERIFY_ARE_EQUAL("TLS handshake failed", e.error_code().message());
66 }
67 }
68-
69+/*
70 TEST(self_signed_cert)
71 {
72 handshake_error_test_impl(U("wss://self-signed.badssl.com/"));
73@@ -236,7 +236,7 @@
74 {
75 handshake_error_test_impl(U("wss://expired.badssl.com/"));
76 }
77-
78+*/
79 #endif
80
81 } // SUITE(authentication_tests)
82Index: casablanca/Release/tests/functional/websockets/client/client_construction.cpp
83===================================================================
84--- casablanca.orig/Release/tests/functional/websockets/client/client_construction.cpp
85+++ casablanca/Release/tests/functional/websockets/client/client_construction.cpp
86@@ -81,7 +81,7 @@
87 VERIFY_ARE_EQUAL(config2.credentials().username(), cred.username());
88 }
89
90-
91+/*
92 // Verify that we can get the baseuri from websocket_client connect.
93 TEST_FIXTURE(uri_address, uri_test)
94 {
95@@ -101,7 +101,7 @@
96 VERIFY_ARE_EQUAL(client2.uri(), m_uri);
97 client2.close().wait();
98 }
99-
100+*/
101 TEST_FIXTURE(uri_address, move_operations)
102 {
103 std::string body("hello");
diff --git a/meta-oe/recipes-support/cpprest/cpprest_2.10.8.bb b/meta-oe/recipes-support/cpprest/cpprest_2.10.9.bb
index b4b1c81e83..4bdc5c682a 100644
--- a/meta-oe/recipes-support/cpprest/cpprest_2.10.8.bb
+++ b/meta-oe/recipes-support/cpprest/cpprest_2.10.9.bb
@@ -8,13 +8,10 @@ DEPENDS = "openssl websocketpp zlib boost brotli"
8EXTRA_OECMAKE = "-DCPPREST_EXPORT_DIR=cmake -DCPPREST_EXCLUDE_BROTLI=OFF" 8EXTRA_OECMAKE = "-DCPPREST_EXPORT_DIR=cmake -DCPPREST_EXCLUDE_BROTLI=OFF"
9 9
10SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=master \ 10SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=master \
11 file://disable-outside-tests.patch \
12 file://disable-test-timeouts.patch \
13 file://disable-float-tests.patch \
14 " 11 "
15 12
16# tag 2.10.8 13# tag 2.10.9
17SRCREV= "204a52610234ac5180e80a6883b62c0ad085f51e" 14SRCREV= "8f0393dd7be08f2d9b44cc09b8b97f9bafb109a5"
18 15
19S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
20 17