This is an automated email from the ASF dual-hosted git repository.

szaszm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git

commit cfb77d1bbab1d092941d27e91bda874064e5c1c2
Author: Gabor Gyimesi <[email protected]>
AuthorDate: Fri Oct 2 17:32:26 2026 +0200

    MINIFICPP-2913 Lower socket timeout for CivetWeb in Conan build
    
    Align socket timeout with source build of the CivetWeb library in Conan 
build to lower HTTP test runtimes.
    
    Closes #2273
    
    Signed-off-by: Marton Szasz <[email protected]>
---
 bootstrap/cli.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bootstrap/cli.py b/bootstrap/cli.py
index 9838bf75b..5ed8ebcd3 100644
--- a/bootstrap/cli.py
+++ b/bootstrap/cli.py
@@ -129,9 +129,14 @@ def run_conan_install(minifi_options: MinifiOptions, 
package_manager: PackageMan
     if not package_manager.run_cmd(conan_remote_add_cmd):
         print("Adding the nifi-conan remote failed")
         return False
+
+    civetweb_conf = (
+        " -c \"civetweb/*:tools.build:defines=['SOCKET_TIMEOUT_QUANTUM=200']\""
+        " -c 
\"civetweb/*:tools.info.package_id:confs=['tools.build:defines']\""
+    )
     build_cmd = (
         f'conan install "{minifi_options.source_dir}" 
--output-folder="{minifi_options.build_dir}" --build=missing {conan_options} '
-        
f"--settings=build_type={minifi_options.build_type.value}{generator_setting}{compiler_settings}"
+        
f"--settings=build_type={minifi_options.build_type.value}{generator_setting}{compiler_settings}{civetweb_conf}"
     )
     if platform.system() == "Linux":
         # Conan's prebuilt m4 binary fails autom4te's version probe in some 
Linux build containers (e.g. RockyLinux 8), so always build m4 from source on 
Linux.

Reply via email to