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 0671f4ed731e6b4cb487486b183088c250fbba35..505830ea5ddfa3550f960d9c108e308278570523 100644 (file)
--- 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)