gnu: aws-c-http: Update to 0.6.7.
* gnu/packages/c.scm (aws-c-http): Update to 0.6.7. [arguments]: Fix CMAKE_PREFIX_PATH, disable network tests. [source]: Remove patches. * gnu/packages/patches/aws-c-http-cmake-prefix.patch, gnu/packages/patches/aws-c-http-disable-networking-tests.patch: Delete files. * gnu/local.mk: Remove them. Signed-off-by: Ludovic Courtès <ludo@gnu.org>master
Greg Hogan
Ludovic Courtès
parent
4ff5cd6b06
commit
1a0ed46097
|
|
@ -874,8 +874,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/aws-c-auth-disable-networking-tests.patch\
|
||||
%D%/packages/patches/aws-c-compression-cmake-prefix.patch \
|
||||
%D%/packages/patches/aws-c-event-stream-cmake-prefix.patch \
|
||||
%D%/packages/patches/aws-c-http-cmake-prefix.patch \
|
||||
%D%/packages/patches/aws-c-http-disable-networking-tests.patch\
|
||||
%D%/packages/patches/aws-c-mqtt-cmake-prefix.patch \
|
||||
%D%/packages/patches/aws-c-s3-cmake-prefix.patch \
|
||||
%D%/packages/patches/aws-c-s3-disable-networking-tests.patch \
|
||||
|
|
|
|||
|
|
@ -719,7 +719,8 @@ low level functionality for coroutines.")
|
|||
(define-public aws-c-http
|
||||
(package
|
||||
(name "aws-c-http")
|
||||
(version "0.6.4")
|
||||
; Update only when updating aws-crt-cpp.
|
||||
(version "0.6.7")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
|
@ -728,15 +729,14 @@ low level functionality for coroutines.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"18xlgz68zizkcp784bs6hkyx0gvp0f1p076i46z653bcd3qa87b4"))
|
||||
(patches
|
||||
(search-patches
|
||||
"aws-c-http-cmake-prefix.patch"
|
||||
"aws-c-http-disable-networking-tests.patch"))))
|
||||
"1s06bz6w7355ldyhwjidcpbff7591ch4lwwjcj47a6k2kczdmiz4"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags
|
||||
'("-DBUILD_SHARED_LIBS=ON")))
|
||||
(list "-DBUILD_SHARED_LIBS=ON"
|
||||
(string-append "-DCMAKE_PREFIX_PATH="
|
||||
(assoc-ref %build-inputs "aws-c-common"))
|
||||
"-DENABLE_NET_TESTS=OFF")))
|
||||
(propagated-inputs
|
||||
`(("aws-c-compression" ,aws-c-compression)
|
||||
("aws-c-io" ,aws-c-io)))
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -7,6 +7,10 @@ endif()
|
||||
|
||||
option(ENABLE_PROXY_INTEGRATION_TESTS "Whether to run the proxy integration tests that rely on a proxy server installed and running locally" OFF)
|
||||
|
||||
+if (DEFINED ENV{CMAKE_PREFIX_PATH})
|
||||
+ set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH})
|
||||
+endif()
|
||||
+
|
||||
if (DEFINED CMAKE_PREFIX_PATH)
|
||||
file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH)
|
||||
endif()
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
--- a/tests/CMakeLists.txt
|
||||
+++ b/tests/CMakeLists.txt
|
||||
@@ -136,8 +136,8 @@ add_test_case(strutil_trim_http_whitespace)
|
||||
add_test_case(strutil_is_http_token)
|
||||
add_test_case(strutil_is_lowercase_http_token)
|
||||
|
||||
-add_net_test_case(tls_download_medium_file_h1)
|
||||
-add_net_test_case(tls_download_medium_file_h2)
|
||||
+#add_net_test_case(tls_download_medium_file_h1)
|
||||
+#add_net_test_case(tls_download_medium_file_h2)
|
||||
|
||||
add_test_case(websocket_decoder_sanity_check)
|
||||
add_test_case(websocket_decoder_simplest_frame)
|
||||
@@ -438,21 +438,21 @@ add_test_case(connection_setup_shutdown)
|
||||
|
||||
# connection manager tests
|
||||
# unit tests where connections are mocked
|
||||
-add_net_test_case(test_connection_manager_setup_shutdown)
|
||||
-add_net_test_case(test_connection_manager_acquire_release_mix_synchronous)
|
||||
-add_net_test_case(test_connection_manager_connect_callback_failure)
|
||||
-add_net_test_case(test_connection_manager_connect_immediate_failure)
|
||||
-add_net_test_case(test_connection_manager_proxy_setup_shutdown)
|
||||
-add_net_test_case(test_connection_manager_idle_culling_single)
|
||||
-add_net_test_case(test_connection_manager_idle_culling_many)
|
||||
-add_net_test_case(test_connection_manager_idle_culling_mixture)
|
||||
+#add_net_test_case(test_connection_manager_setup_shutdown)
|
||||
+#add_net_test_case(test_connection_manager_acquire_release_mix_synchronous)
|
||||
+#add_net_test_case(test_connection_manager_connect_callback_failure)
|
||||
+#add_net_test_case(test_connection_manager_connect_immediate_failure)
|
||||
+#add_net_test_case(test_connection_manager_proxy_setup_shutdown)
|
||||
+#add_net_test_case(test_connection_manager_idle_culling_single)
|
||||
+#add_net_test_case(test_connection_manager_idle_culling_many)
|
||||
+#add_net_test_case(test_connection_manager_idle_culling_mixture)
|
||||
|
||||
# tests where we establish real connections
|
||||
-add_net_test_case(test_connection_manager_single_connection)
|
||||
-add_net_test_case(test_connection_manager_many_connections)
|
||||
-add_net_test_case(test_connection_manager_acquire_release)
|
||||
-add_net_test_case(test_connection_manager_close_and_release)
|
||||
-add_net_test_case(test_connection_manager_acquire_release_mix)
|
||||
+#add_net_test_case(test_connection_manager_single_connection)
|
||||
+#add_net_test_case(test_connection_manager_many_connections)
|
||||
+#add_net_test_case(test_connection_manager_acquire_release)
|
||||
+#add_net_test_case(test_connection_manager_close_and_release)
|
||||
+#add_net_test_case(test_connection_manager_acquire_release_mix)
|
||||
|
||||
|
||||
add_test_case(h1_server_sanity_check)
|
||||
Reference in New Issue