Skip to content

Commit 4c02092

Browse files
authored
Fix Libwebsockets CI (#2737)
## Description of changes: Some secure streams tests (ss-warmcat|ssblob-warmcat|ssperf-warmcat|ssstress-warmcat) were timing out due to authentication issues with api.amazon.com and sigv4. Disabling sigv4 tests as upstream has here ([link](warmcat/libwebsockets@7c06d35#diff-17dfd33b7942904d95d379d1f3c633b3cd077524390b2ba2a5d3065a9fa99be9)) fixes this issue for now - we won't need this once the new release of libwebsockets is out. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and the ISC license.
1 parent 984e2b1 commit 4c02092

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

tests/ci/integration/libwebsockets_patch/libwebsocket_master.patch

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
diff --git a/CMakeLists-implied-options.txt b/CMakeLists-implied-options.txt
2+
index f9381454..b0e39341 100644
3+
--- a/CMakeLists-implied-options.txt
4+
+++ b/CMakeLists-implied-options.txt
5+
@@ -340,10 +340,6 @@ if (NOT LWS_WITHOUT_EXTENSIONS OR LWS_WITH_ZIP_FOPS)
6+
set(LWS_WITH_ZLIB 1)
7+
endif()
8+
9+
-if (LWS_WITH_SECURE_STREAMS)
10+
- set(LWS_WITH_SECURE_STREAMS_SYS_AUTH_API_AMAZON_COM 1)
11+
-endif()
12+
-
13+
if (NOT (LWS_WITH_STATIC OR LWS_WITH_SHARED))
14+
message(FATAL_ERROR "Makes no sense to compile with neither static nor shared libraries.")
15+
endif()
116
diff --git a/minimal-examples-lowlevel/secure-streams/minimal-secure-streams-testsfail/CMakeLists.txt b/minimal-examples-lowlevel/secure-streams/minimal-secure-streams-testsfail/CMakeLists.txt
217
index 3f9b3ba8..3f762b0b 100644
318
--- a/minimal-examples-lowlevel/secure-streams/minimal-secure-streams-testsfail/CMakeLists.txt
@@ -18,7 +33,7 @@ index 3f9b3ba8..3f762b0b 100644
1833

1934
if (LWS_CTEST_INTERNET_AVAILABLE AND NOT WIN32)
2035
diff --git a/minimal-examples-lowlevel/secure-streams/minimal-secure-streams-testsfail/minimal-secure-streams-testsfail.c b/minimal-examples-lowlevel/secure-streams/minimal-secure-streams-testsfail/minimal-secure-streams-testsfail.c
21-
index 176b3d27..6c927dcc 100644
36+
index 176b3d27..caef4af2 100644
2237
--- a/minimal-examples-lowlevel/secure-streams/minimal-secure-streams-testsfail/minimal-secure-streams-testsfail.c
2338
+++ b/minimal-examples-lowlevel/secure-streams/minimal-secure-streams-testsfail/minimal-secure-streams-testsfail.c
2439
@@ -24,6 +24,12 @@ static lws_state_notify_link_t nl;

0 commit comments

Comments
 (0)