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, 10 insertions, 18 deletions

diff --git a/src/regress/lib/libssl/interop/openssl11/Makefile b/src/regress/lib/libssl/interop/openssl11/Makefile
index ef625dffb8..3ea1ef35da 100644
--- a/src/regress/lib/libssl/interop/openssl11/Makefile
+++ b/src/regress/lib/libssl/interop/openssl11/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2018/11/10 08:33:45 bluhm Exp $
+# $OpenBSD: Makefile,v 1.5 2018/11/11 00:15:04 bluhm Exp $
 
 .if ! exists(/usr/local/bin/eopenssl11)
 regress:
@@ -13,20 +13,13 @@ LDADD =			-lssl -lcrypto
 DPADD =                 /usr/local/lib/eopenssl11/libssl.a \
                         /usr/local/lib/eopenssl11/libcrypto.a
 LD_LIBRARY_PATH =       /usr/local/lib/eopenssl11
-REGRESS_TARGETS =       run-self
+REGRESS_TARGETS =       run-self-client-server
 .for p in ${PROGS}
-REGRESS_TARGETS +=      run-ldd-$p run-$p
-.for x in nc self
-REGRESS_TARGETS +=      run-version-$x-$p run-protocol-$x-$p
+REGRESS_TARGETS +=      run-ldd-$p run-version-$p run-protocol-$p
 .endfor
-.endfor
-
-run-protocol-nc-client run-protocol-nc-server:
-        @echo '\n======== $@ ========'
-        # LibreSSL does not support TLS 1.3 yet
-        @echo DISABLED
 
 .for p in ${PROGS}
+
 run-ldd-$p: ldd-$p.out
         @echo '\n======== $@ ========'
         # check that $p is linked with OpenSSL 1.1
@@ -34,18 +27,17 @@ run-ldd-$p: ldd-$p.out
         grep -q /usr/local/lib/eopenssl11/libssl.so ldd-$p.out
         # check that $p is not linked with LibreSSL
         ! grep -v libc.so ldd-$p.out | grep /usr/lib/
-.endfor
 
-.for o in nc-client nc-server self-client self-server
-run-version-$o: $o.out
+run-version-$p: $p-self.out
         @echo '\n======== $@ ========'
         # check that runtime version is OpenSSL 1.1
-        grep 'SSLEAY_VERSION: OpenSSL 1.1' $o.out
+        grep 'SSLEAY_VERSION: OpenSSL 1.1' $p-self.out
 
-run-protocol-$o: $o.out
+run-protocol-$p: $p-self.out
         @echo '\n======== $@ ========'
-        # check that protocol version is TLS 1.3
-        grep 'Protocol *: TLSv1.3' $o.out
+        # check that OpenSSL 1.1 protocol version is TLS 1.3
+        grep 'Protocol *: TLSv1.3' $p-self.out
+
 .endfor
 
 .include <bsd.regress.mk>