diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-16 17:11:34 -0800 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-08 18:21:44 -0500 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | blackbird-openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.gz blackbird-openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.zip |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch | 142 |
1 files changed, 142 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch b/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch new file mode 100644 index 000000000..2dff0d97c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch @@ -0,0 +1,142 @@ +Description: Debian forbids calls to external websites. + +Author: Gianfranco Costamagna <locutus@debian.org> +Origin: Debian +Forwarded: not-needed +Reviewed-By: Gianfranco Costamagna <locutusofborg@debian.org> +Last-Update: 2015-11-25 + +Index: casablanca/Release/tests/functional/http/client/CMakeLists.txt +=================================================================== +--- casablanca.orig/Release/tests/functional/http/client/CMakeLists.txt ++++ casablanca/Release/tests/functional/http/client/CMakeLists.txt +@@ -12,7 +12,6 @@ + multiple_requests.cpp + oauth1_tests.cpp + oauth2_tests.cpp +- outside_tests.cpp + pipeline_stage_tests.cpp + progress_handler_tests.cpp + proxy_tests.cpp +Index: casablanca/Release/tests/functional/http/client/authentication_tests.cpp +=================================================================== +--- casablanca.orig/Release/tests/functional/http/client/authentication_tests.cpp ++++ casablanca/Release/tests/functional/http/client/authentication_tests.cpp +@@ -663,15 +663,19 @@ + VERIFY_ARE_EQUAL(return_code, response.status_code()); + } + ++/* + TEST(auth_no_data) + { + auth_test_impl(false); + } ++*/ + ++/* + TEST(unsuccessful_auth_with_basic_cred) + { + auth_test_impl(true); + } ++*/ + + TEST_FIXTURE(uri_address, set_user_options_asio_http) + { +@@ -692,7 +696,7 @@ + auto response = client.request(methods::GET).get(); + VERIFY_ARE_EQUAL(200, response.status_code()); + } +- ++/* + TEST_FIXTURE(uri_address, set_user_options_asio_https) + { + handle_timeout([] +@@ -714,7 +718,7 @@ + VERIFY_IS_FALSE(v.empty()); + }); + } +- ++*/ + #endif + + } // SUITE(authentication_tests) +Index: casablanca/Release/tests/functional/websockets/client/authentication_tests.cpp +=================================================================== +--- casablanca.orig/Release/tests/functional/websockets/client/authentication_tests.cpp ++++ casablanca/Release/tests/functional/websockets/client/authentication_tests.cpp +@@ -86,7 +86,7 @@ + } + return false; + } +- ++/* + TEST(ssl_test) + { + websocket_client client; +@@ -122,7 +122,7 @@ + throw; + } + } +- ++*/ + // These tests are specific to our websocketpp based implementation. + #if !defined(__cplusplus_winrt) + +@@ -153,14 +153,15 @@ + 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. +@@ -188,7 +189,8 @@ + throw; + } + } +- ++*/ ++/* + // Winrt doesn't allow explicitly setting server host for SNI. + TEST(sni_explicit_hostname) + { +@@ -199,7 +201,7 @@ + websocket_client client(config); + sni_test_impl(client); + } +- ++*/ + void handshake_error_test_impl(const ::utility::string_t &host) + { + websocket_client client; +Index: casablanca/Release/tests/functional/http/client/connections_and_errors.cpp +=================================================================== +--- casablanca.orig/Release/tests/functional/http/client/connections_and_errors.cpp ++++ casablanca/Release/tests/functional/http/client/connections_and_errors.cpp +@@ -415,6 +415,7 @@ + } + #endif + ++/* + // Try to connect to a server on a closed port and cancel the operation. + TEST_FIXTURE(uri_address, cancel_bad_port) + { +@@ -446,7 +447,7 @@ + + VERIFY_THROWS_HTTP_ERROR_CODE(t.get(), std::errc::operation_canceled); + } +- ++*/ + } // SUITE(connections_and_errors) + + }}}} |