From: Hugo Landau <hlandau@openssl.org>
Date: Wed, 9 Aug 2023 16:46:33 +0000 (+0100)
Subject: QUIC DDD: Update makefile
X-Git-Tag: openssl-3.2.0-alpha1~77
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=be4c3446a475a8449aa00e550de9de887ec44a70;p=thirdparty%2Fopenssl.git

QUIC DDD: Update makefile

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21715)
---

diff --git a/doc/designs/ddd/Makefile b/doc/designs/ddd/Makefile
index 0671f4ed731..505830ea5dd 100644
--- a/doc/designs/ddd/Makefile
+++ b/doc/designs/ddd/Makefile
@@ -3,10 +3,12 @@
 #
 #    LD_LIBRARY_PATH=../.. make test
 
-TESTS=ddd-01-conn-blocking ddd-02-conn-nonblocking ddd-03-fd-blocking ddd-04-fd-nonblocking ddd-05-mem-nonblocking ddd-06-mem-uv
+TESTS_BASE=ddd-01-conn-blocking ddd-02-conn-nonblocking ddd-02-conn-nonblocking-threads \
+		   ddd-03-fd-blocking ddd-04-fd-nonblocking ddd-05-mem-nonblocking ddd-06-mem-uv
+TESTS=$(foreach x,$(TESTS_BASE),$(x)-tls $(x)-quic)
 
-CFLAGS = -I../include -O3 -g -Wall
-LDFLAGS = -L..
+CFLAGS = -I../../../include -O3 -g -Wall
+LDFLAGS = -L../../..
 LDLIBS = -lcrypto -lssl
 
 all: $(TESTS)
@@ -14,11 +16,14 @@ all: $(TESTS)
 clean:
 	rm -f $(TESTS) *.o
 
-test: all
-	for x in $(TESTS); do echo "$$x"; LD_LIBRARY_PATH="$$(pwd)/.." ./$$x | grep -q '</html>' || { echo >&2 'Error'; exit 1; }; done
-
-ddd-06-mem-uv: ddd-06-mem-uv.c
+ddd-06-mem-uv-tls: ddd-06-mem-uv.c
 	$(CC) $(CFLAGS) $(LDFLAGS) -o "$@" "$<" $(LDLIBS) -luv
 
-ddd-%: ddd-%.c
+ddd-06-mem-uv-quic: ddd-06-mem-uv.c
+	$(CC) $(CFLAGS) $(LDFLAGS) -DUSE_QUIC -o "$@" "$<" $(LDLIBS) -luv
+
+ddd-%-quic: ddd-%.c
+	$(CC) $(CFLAGS) $(LDFLAGS) -DUSE_QUIC -o "$@" "$<" $(LDLIBS)
+
+ddd-%-tls: ddd-%.c
 	$(CC) $(CFLAGS) $(LDFLAGS) -o "$@" "$<" $(LDLIBS)