From: Randall S. Becker <randall.becker@nexbridge.ca>
Date: Wed, 22 May 2024 23:34:45 +0000 (+0000)
Subject: Disable 70-test_quic_multistream.t when building with PUT threads.
X-Git-Tag: openssl-3.3.1~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c81e950dc22d00209cab58bc684eaf4bdc1d6f48;p=thirdparty%2Fopenssl.git

Disable 70-test_quic_multistream.t when building with PUT threads.

The test recipe includes a TEST_skip when OpenSSL is built with _PUT_MODEL_
based on design assumptions for QUIC and incompatibility with PUT wrapper
methods.

Fixes: #24442
Fixes: #24431

Signed-off-by: Randall S. Becker <randall.becker@nexbridge.ca>

Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24468)

(cherry picked from commit 0e2567d7293d3204de66acca0ed55bda4f0c0768)
---

diff --git a/NOTES-NONSTOP.md b/NOTES-NONSTOP.md
index 09085967de6..2b35151ec0a 100644
--- a/NOTES-NONSTOP.md
+++ b/NOTES-NONSTOP.md
@@ -35,6 +35,9 @@ for each on the TNS/X (L-Series) platform:
 
 The SPT threading model is no longer supported as of OpenSSL 3.2.
 
+The PUT model is incompatible with the QUIC capability. This capability should
+be disabled when building with PUT.
+
 ### TNS/E Considerations
 
 The TNS/E platform is build using the same set of builds specifying `nse`
diff --git a/test/quic_multistream_test.c b/test/quic_multistream_test.c
index fb2daac879d..c74488ebf72 100644
--- a/test/quic_multistream_test.c
+++ b/test/quic_multistream_test.c
@@ -5923,6 +5923,10 @@ OPT_TEST_DECLARE_USAGE("certfile privkeyfile\n")
 
 int setup_tests(void)
 {
+#if defined (_PUT_MODEL_)
+    return TEST_skip("QUIC is not supported by this build");
+#endif
+
     if (!test_skip_common_options()) {
         TEST_error("Error parsing test options\n");
         return 0;