Reorganize libssl interop tests. Move netcat tests into separate

directory.  Keep all log files for easier debugging.  Name regress
target names consistently.

1 files changed, 26 insertions, 19 deletions

diff --git a/src/regress/lib/libssl/interop/session/Makefile b/src/regress/lib/libssl/interop/session/Makefile
index a555f133fb..072fa1b93c 100644
--- a/src/regress/lib/libssl/interop/session/Makefile
+++ b/src/regress/lib/libssl/interop/session/Makefile
@@ -1,35 +1,42 @@
-# $OpenBSD: Makefile,v 1.1 2018/11/10 08:33:45 bluhm Exp $
+# $OpenBSD: Makefile,v 1.2 2018/11/11 00:15:04 bluhm Exp $
 
-run-client-openssl11-reuse-server-openssl11-reuse:
+LIBRARIES =             libressl
+.if exists(/usr/local/bin/eopenssl)
+LIBRARIES +=            openssl
+.endif
+.if exists(/usr/local/bin/eopenssl11)
+LIBRARIES +=            openssl11
+.endif
+
+run-session-client-openssl11-server-openssl11:
         @echo '\n======== $@ ========'
         # TLS 1.3 needs some extra setup for session reuse
         @echo DISABLED
 
-CLEANFILES +=           *.out
-
-.for clib in libressl openssl openssl11
-.for slib in libressl openssl openssl11
+.for clib in ${LIBRARIES}
+.for slib in ${LIBRARIES}
 
-REGRESS_TARGETS +=      run-client-${clib}-reuse-server-${slib}-reuse
+REGRESS_TARGETS +=      run-session-client-${clib}-server-${slib}
 
-run-client-${clib}-reuse-server-${slib}-reuse: 127.0.0.1.crt
+run-session-client-${clib}-server-${slib}: \
+    127.0.0.1.crt ../${clib}/client ../${slib}/server
         @echo '\n======== $@ ========'
         LD_LIBRARY_PATH=/usr/local/lib/e${slib} \
-            ../${slib}/server >server-${slib}-reuse.out \
+            ../${slib}/server >${@:S/^run/server/}.out \
             -ss \
             127.0.0.1 0
         LD_LIBRARY_PATH=/usr/local/lib/e${clib} \
-            ../${clib}/client >client-${clib}-reuse.out \
+            ../${clib}/client >${@:S/^run/client/}.out \
             -ss \
-            `sed -n 's/listen sock: //p' server-${slib}-reuse.out`
-        grep '^success$$' server-${slib}-reuse.out
-        grep '^success$$' client-${clib}-reuse.out
-        grep '^session 2: new$$' server-${slib}-reuse.out
-        grep '^session 2: new$$' client-${clib}-reuse.out
-        grep '^session 1: reuse$$' server-${slib}-reuse.out
-        grep '^session 1: reuse$$' client-${clib}-reuse.out
-        grep '^session 0: reuse$$' server-${slib}-reuse.out
-        grep '^session 0: reuse$$' client-${clib}-reuse.out
+            `sed -n 's/listen sock: //p' ${@:S/^run/server/}.out`
+        grep '^success$$' ${@:S/^run/server/}.out
+        grep '^success$$' ${@:S/^run/client/}.out
+        grep '^session 2: new$$' ${@:S/^run/server/}.out
+        grep '^session 2: new$$' ${@:S/^run/client/}.out
+        grep '^session 1: reuse$$' ${@:S/^run/server/}.out
+        grep '^session 1: reuse$$' ${@:S/^run/client/}.out
+        grep '^session 0: reuse$$' ${@:S/^run/server/}.out
+        grep '^session 0: reuse$$' ${@:S/^run/client/}.out
 
 .endfor
 .endfor