diff options
author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2020-12-17 00:51:14 +0000 |
---|---|---|
committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2020-12-17 00:51:14 +0000 |
commit | ab9e6159540b71c8a5f8900b7b00e62529eb50d8 (patch) | |
tree | 7e5d0abf609ad5c52e7b45ecdba6ba9dfde10105 /regress/lib | |
parent | b8fdd43d117162c8d2a8575e183b845dd894b5bb (diff) |
Remove echo headlines.
Diffstat (limited to 'regress/lib')
-rw-r--r-- | regress/lib/libc/setjmp-fpu/Makefile | 4 | ||||
-rw-r--r-- | regress/lib/libc/sys/Makefile | 3 | ||||
-rw-r--r-- | regress/lib/libcrypto/bn/general/Makefile | 5 | ||||
-rw-r--r-- | regress/lib/libcrypto/ocsp/Makefile | 3 | ||||
-rw-r--r-- | regress/lib/libm/msun/Makefile | 3 | ||||
-rw-r--r-- | regress/lib/libssl/handshake/Makefile | 3 | ||||
-rw-r--r-- | regress/lib/libssl/interop/Makefile.inc | 3 | ||||
-rw-r--r-- | regress/lib/libssl/interop/botan/Makefile | 3 | ||||
-rw-r--r-- | regress/lib/libssl/interop/cert/Makefile | 3 | ||||
-rw-r--r-- | regress/lib/libssl/interop/cipher/Makefile | 5 | ||||
-rw-r--r-- | regress/lib/libssl/interop/libressl/Makefile | 5 | ||||
-rw-r--r-- | regress/lib/libssl/interop/netcat/Makefile | 6 | ||||
-rw-r--r-- | regress/lib/libssl/interop/openssl/Makefile | 5 | ||||
-rw-r--r-- | regress/lib/libssl/interop/openssl11/Makefile | 5 | ||||
-rw-r--r-- | regress/lib/libssl/interop/session/Makefile | 4 | ||||
-rw-r--r-- | regress/lib/libssl/interop/version/Makefile | 4 |
16 files changed, 16 insertions, 48 deletions
diff --git a/regress/lib/libc/setjmp-fpu/Makefile b/regress/lib/libc/setjmp-fpu/Makefile index c4e7196c1d2..e3dd2daa52b 100644 --- a/regress/lib/libc/setjmp-fpu/Makefile +++ b/regress/lib/libc/setjmp-fpu/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2020/01/16 13:03:42 bluhm Exp $ +# $OpenBSD: Makefile,v 1.5 2020/12/17 00:51:11 bluhm Exp $ PROGS= fpu _setjmp setjmp sigsetjmp @@ -6,14 +6,12 @@ LDADD= -lm REGRESS_TARGETS = run-fpu run-fpu: fpu - @echo '======== $@ ========' # check fpu functions without setjmp/longjmp before testing the latter ./fpu .for p in ${PROGS:M*jmp} REGRESS_TARGETS += run-$p run-$p: $p - @echo '======== $@ ========' ./$p .endfor diff --git a/regress/lib/libc/sys/Makefile b/regress/lib/libc/sys/Makefile index 7dcfcb73a9f..7a3b920426d 100644 --- a/regress/lib/libc/sys/Makefile +++ b/regress/lib/libc/sys/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2020/12/06 18:46:07 bluhm Exp $ +# $OpenBSD: Makefile,v 1.10 2020/12/17 00:51:11 bluhm Exp $ # Copyright (c) 2019 Moritz Buhl <openbsd@moritzbuhl.de> # Copyright (c) 2019 Alexander Bluhm <bluhm@openbsd.org> @@ -75,7 +75,6 @@ CLEANFILES = access dummy mmap truncate_test.root_owned .for p in ${PROGS} run-$p: $p - @echo "\n======== $@ ========" ntests="`./$p -n`" && \ echo "1..$$ntests" && \ tnumbers="`jot -ns' ' - 1 $$ntests`" && \ diff --git a/regress/lib/libcrypto/bn/general/Makefile b/regress/lib/libcrypto/bn/general/Makefile index ca3dcf9b085..6b7919eb532 100644 --- a/regress/lib/libcrypto/bn/general/Makefile +++ b/regress/lib/libcrypto/bn/general/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2019/09/05 00:59:36 bluhm Exp $ +# $OpenBSD: Makefile,v 1.7 2020/12/17 00:51:11 bluhm Exp $ .include "../../Makefile.inc" @@ -13,18 +13,15 @@ CLEANFILES = bntest.out bc.out REGRESS_TARGETS += run-bntest run-bntest bntest.out: bntest - @echo '\n======== $@ ========' ./bntest -out bntest.out REGRESS_TARGETS += run-bc run-bc: bntest.out - @echo '\n======== $@ ========' bc < bntest.out | tee bc.out | grep -v '^0$$' ! grep -v '^test ' <bc.out | grep -v '^0$$' REGRESS_TARGETS += run-bn_to_string run-bn_to_string: bn_to_string - @echo '\n======== $@ ========' ./bn_to_string .include <bsd.regress.mk> diff --git a/regress/lib/libcrypto/ocsp/Makefile b/regress/lib/libcrypto/ocsp/Makefile index b1b437c9161..f0b43acc2b7 100644 --- a/regress/lib/libcrypto/ocsp/Makefile +++ b/regress/lib/libcrypto/ocsp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2020/11/05 20:48:05 bluhm Exp $ +# $OpenBSD: Makefile,v 1.5 2020/12/17 00:51:11 bluhm Exp $ PROG= ocsp_test LDADD= -lcrypto -lssl @@ -15,7 +15,6 @@ REGRESS_TARGETS = .for s in ${SERVERS} REGRESS_TARGETS += run-domain-$s run-domain-$s: ${PROG} - @echo '======== $@ ========' if ping -n -c 1 -w 1 $s; then \ ./${PROG} $s 443; else \ echo server $s not reachable; echo SKIPPED; fi diff --git a/regress/lib/libm/msun/Makefile b/regress/lib/libm/msun/Makefile index 467206c688e..16f916913db 100644 --- a/regress/lib/libm/msun/Makefile +++ b/regress/lib/libm/msun/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2020/11/07 08:58:28 kettenis Exp $ +# $OpenBSD: Makefile,v 1.3 2020/12/17 00:51:11 bluhm Exp $ TESTS = TESTS += conj_test @@ -13,7 +13,6 @@ DPADD= ${LIBM} .for t in ${TESTS} REGRESS_TARGETS+= run-$t run-$t: $t - @echo "\n======== $@ ========" ./$t .endfor diff --git a/regress/lib/libssl/handshake/Makefile b/regress/lib/libssl/handshake/Makefile index 626bf4767a0..aa0f70bd3b4 100644 --- a/regress/lib/libssl/handshake/Makefile +++ b/regress/lib/libssl/handshake/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2019/11/06 10:28:58 tb Exp $ +# $OpenBSD: Makefile,v 1.8 2020/12/17 00:51:11 bluhm Exp $ PROGS += handshake_table PROGS += valid_handshakes_terminate @@ -34,7 +34,6 @@ CLEANFILES += handshake.${_FMT} .for p in ${PROGS} run-$p: $p - @echo '\n======== $@ ========' ./$p .PHONY: run-$p diff --git a/regress/lib/libssl/interop/Makefile.inc b/regress/lib/libssl/interop/Makefile.inc index 91f88e2b0bf..ed5fe26147b 100644 --- a/regress/lib/libssl/interop/Makefile.inc +++ b/regress/lib/libssl/interop/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.7 2020/09/15 01:45:16 bluhm Exp $ +# $OpenBSD: Makefile.inc,v 1.8 2020/12/17 00:51:11 bluhm Exp $ .PATH: ${.CURDIR}/.. @@ -16,7 +16,6 @@ ldd-$p.out: $p client-self.out server-self.out: run-self-client-server run-self-client-server: client server 127.0.0.1.crt - @echo '\n======== $@ ========' # check that tls client and server work together LD_LIBRARY_PATH=${LD_LIBRARY_PATH} \ ./server >server-self.out \ diff --git a/regress/lib/libssl/interop/botan/Makefile b/regress/lib/libssl/interop/botan/Makefile index 7d5435f9d25..a162ee9e173 100644 --- a/regress/lib/libssl/interop/botan/Makefile +++ b/regress/lib/libssl/interop/botan/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2020/10/30 03:12:40 tb Exp $ +# $OpenBSD: Makefile,v 1.4 2020/12/17 00:51:11 bluhm Exp $ .include <bsd.own.mk> @@ -37,7 +37,6 @@ DPADD = /usr/local/lib/libbotan-2.a REGRESS_TARGETS += run-client-botan-server-${lib} run-client-botan-server-${lib}: client server.crt - @echo '\n======== $@ ========' LD_LIBRARY_PATH=/usr/local/lib/e${lib} \ ../${lib}/server >server-${lib}.out \ -c server.crt -k server.key \ diff --git a/regress/lib/libssl/interop/cert/Makefile b/regress/lib/libssl/interop/cert/Makefile index a2838499e80..a8ea88aaa37 100644 --- a/regress/lib/libssl/interop/cert/Makefile +++ b/regress/lib/libssl/interop/cert/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2020/09/21 15:13:24 beck Exp $ +# $OpenBSD: Makefile,v 1.6 2020/12/17 00:51:11 bluhm Exp $ # Connect a client to a server. Both can be current libressl, or # openssl 1.0.2, or openssl 1.1. Create client and server certificates @@ -45,7 +45,6 @@ REGRESS_SLOW_TARGETS += run-cert-client-${clib}-${cca}-${ccert}-${cv}-server-${s run-cert-client-${clib}-${cca}-${ccert}-${cv}-server-${slib}-${sca}-${scert}-${sv}: \ 127.0.0.1.crt ca.crt fake-ca.crt client.crt server.crt \ ../${clib}/client ../${slib}/server - @echo '\n======== $@ ========' LD_LIBRARY_PATH=/usr/local/lib/e${slib} \ ../${slib}/server >${@:S/^run/server/}.out \ ${sca:S/^noca//:S/^fakeca/-C fake-ca.crt/:S/^ca/-C ca.crt/} \ diff --git a/regress/lib/libssl/interop/cipher/Makefile b/regress/lib/libssl/interop/cipher/Makefile index fe74901d114..c88309962df 100644 --- a/regress/lib/libssl/interop/cipher/Makefile +++ b/regress/lib/libssl/interop/cipher/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2020/09/21 15:13:24 beck Exp $ +# $OpenBSD: Makefile,v 1.7 2020/12/17 00:51:11 bluhm Exp $ # Connect a client to a server. Both can be current libressl, or # openssl 1.0.2, or openssl 1.1. Create lists of supported ciphers @@ -14,7 +14,6 @@ server-cipher-GOST2001-GOST89-GOST89-client-libressl-server-libressl.out \ server-cipher-GOST2012256-GOST89-GOST89-client-libressl-server-libressl.out \ check-cipher-GOST2001-GOST89-GOST89-client-libressl-server-libressl \ check-cipher-GOST2012256-GOST89-GOST89-client-libressl-server-libressl: - @echo '\n======== $@ ========' # gost does not work with libressl TLS 1.3 right now @echo DISABLED @@ -112,7 +111,6 @@ run-cipher-${cipher}-client-${clib}-server-${slib} \ client-cipher-${cipher}-client-${clib}-server-${slib}.out \ server-cipher-${cipher}-client-${clib}-server-${slib}.out: dh.param \ 127.0.0.1.crt ${TYPE_${cipher}}.crt ../${clib}/client ../${slib}/server - @echo '\n======== $@ ========' LD_LIBRARY_PATH=/usr/local/lib/e${slib} \ ../${slib}/server >${@:S/^run/server/}.out \ -c ${TYPE_${cipher}}.crt -k ${TYPE_${cipher}}.key \ @@ -134,7 +132,6 @@ REGRESS_SLOW_TARGETS += check-cipher-${cipher}-client-${clib}-server-${slib} check-cipher-${cipher}-client-${clib}-server-${slib}: \ client-cipher-${cipher}-client-${clib}-server-${slib}.out \ server-cipher-${cipher}-client-${clib}-server-${slib}.out - @echo '\n======== $@ ========' .if "${clib}" != "openssl" && "${slib}" != "openssl" && \ "${cipher:C/AEAD-(AES.*-GCM|CHACHA.*-POLY.*)-SHA.*/TLS1_3/}" != TLS1_3 # client and server 1.3 capable, not TLS 1.3 cipher diff --git a/regress/lib/libssl/interop/libressl/Makefile b/regress/lib/libssl/interop/libressl/Makefile index d19e6eb306a..78e995abef6 100644 --- a/regress/lib/libssl/interop/libressl/Makefile +++ b/regress/lib/libssl/interop/libressl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2020/09/14 00:51:04 bluhm Exp $ +# $OpenBSD: Makefile,v 1.8 2020/12/17 00:51:11 bluhm Exp $ PROGS = client server CFLAGS = -DLIBRESSL_HAS_TLS1_3 @@ -15,7 +15,6 @@ REGRESS_TARGETS += run-ldd-$p run-version-$p run-protocol-$p .for p in ${PROGS} run-ldd-$p: ldd-$p.out - @echo '\n======== $@ ========' # check that $p is linked with LibreSSL grep -q /usr/lib/libcrypto.so ldd-$p.out grep -q /usr/lib/libssl.so ldd-$p.out @@ -23,12 +22,10 @@ run-ldd-$p: ldd-$p.out ! grep /usr/local/lib/ ldd-$p.out run-version-$p: $p-self.out - @echo '\n======== $@ ========' # check that runtime version is LibreSSL grep 'SSLEAY_VERSION: LibreSSL' $p-self.out run-protocol-$p: $p-self.out - @echo '\n======== $@ ========' # check that LibreSSL protocol version is TLS 1.3 grep 'Protocol *: TLSv1.3' $p-self.out diff --git a/regress/lib/libssl/interop/netcat/Makefile b/regress/lib/libssl/interop/netcat/Makefile index ef51d0597e5..f337d4aae8b 100644 --- a/regress/lib/libssl/interop/netcat/Makefile +++ b/regress/lib/libssl/interop/netcat/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2020/05/11 18:20:24 jsing Exp $ +# $OpenBSD: Makefile,v 1.5 2020/12/17 00:51:11 bluhm Exp $ LIBRARIES = libressl .if exists(/usr/local/bin/eopenssl) @@ -16,7 +16,6 @@ REGRESS_TARGETS += run-netcat-client-${clib}-server-nc REGRESS_TARGETS += run-protocol-client-${clib} run-netcat-client-${clib}-server-nc: ../${clib}/client 127.0.0.1.crt - @echo '\n======== $@ ========' echo "greeting" | \ nc >${@:S/^run/server/}.out \ -l -c -C 127.0.0.1.crt -K 127.0.0.1.key \ @@ -43,7 +42,6 @@ run-netcat-client-${clib}-server-nc: ../${clib}/client 127.0.0.1.crt REGRESS_TARGETS += run-netcat-client-nc-server-${slib} run-netcat-client-nc-server-${slib}: ../${slib}/server 127.0.0.1.crt - @echo '\n======== $@ ========' LD_LIBRARY_PATH=/usr/local/lib/e${slib} \ ../${slib}/server >${@:S/^run/server/}.out \ 127.0.0.1 0 @@ -68,7 +66,6 @@ run-netcat-client-nc-server-${slib}: ../${slib}/server 127.0.0.1.crt REGRESS_TARGETS += run-protocol-client-${clib} run-protocol-client-${clib}: client-netcat-client-${clib}-server-nc.out - @echo '\n======== $@ ========' # check that LibTLS protocol version is TLS 1.2 or TLS 1.3 grep 'Protocol *: TLSv1.[23]' client-netcat-client-${clib}-server-nc.out @@ -79,7 +76,6 @@ run-protocol-client-${clib}: client-netcat-client-${clib}-server-nc.out REGRESS_TARGETS += run-protocol-server-${slib} run-protocol-server-${slib}: server-netcat-client-nc-server-${slib}.out - @echo '\n======== $@ ========' # check that LibTLS protocol version is TLS 1.2 or TLS 1.3 grep 'Protocol *: TLSv1.[23]' server-netcat-client-nc-server-${slib}.out diff --git a/regress/lib/libssl/interop/openssl/Makefile b/regress/lib/libssl/interop/openssl/Makefile index e56312505fb..181d35aa028 100644 --- a/regress/lib/libssl/interop/openssl/Makefile +++ b/regress/lib/libssl/interop/openssl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2020/10/29 06:05:12 tb Exp $ +# $OpenBSD: Makefile,v 1.8 2020/12/17 00:51:11 bluhm Exp $ .if ! exists(/usr/local/bin/eopenssl) regress: @@ -21,7 +21,6 @@ REGRESS_TARGETS += run-ldd-$p run-version-$p run-protocol-$p .for p in ${PROGS} run-ldd-$p: ldd-$p.out - @echo '\n======== $@ ========' # check that $p is linked with OpenSSL grep -q /usr/local/lib/eopenssl/libcrypto.so ldd-$p.out grep -q /usr/local/lib/eopenssl/libssl.so ldd-$p.out @@ -29,12 +28,10 @@ run-ldd-$p: ldd-$p.out ! grep -v libc.so ldd-$p.out | grep /usr/lib/ run-version-$p: $p-self.out - @echo '\n======== $@ ========' # check that runtime version is OpenSSL 1.0.2 grep 'SSLEAY_VERSION: OpenSSL 1.0.2' $p-self.out run-protocol-$p: $p-self.out - @echo '\n======== $@ ========' # check that OpenSSL 1.0.2 protocol version is TLS 1.2 grep 'Protocol *: TLSv1.2' $p-self.out diff --git a/regress/lib/libssl/interop/openssl11/Makefile b/regress/lib/libssl/interop/openssl11/Makefile index 678b1be2554..32fd611ae4f 100644 --- a/regress/lib/libssl/interop/openssl11/Makefile +++ b/regress/lib/libssl/interop/openssl11/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2020/10/29 06:05:12 tb Exp $ +# $OpenBSD: Makefile,v 1.7 2020/12/17 00:51:11 bluhm Exp $ .if ! exists(/usr/local/bin/eopenssl11) regress: @@ -21,7 +21,6 @@ REGRESS_TARGETS += run-ldd-$p run-version-$p run-protocol-$p .for p in ${PROGS} run-ldd-$p: ldd-$p.out - @echo '\n======== $@ ========' # check that $p is linked with OpenSSL 1.1 grep -q /usr/local/lib/eopenssl11/libcrypto.so ldd-$p.out grep -q /usr/local/lib/eopenssl11/libssl.so ldd-$p.out @@ -29,12 +28,10 @@ run-ldd-$p: ldd-$p.out ! grep -v libc.so ldd-$p.out | grep /usr/lib/ run-version-$p: $p-self.out - @echo '\n======== $@ ========' # check that runtime version is OpenSSL 1.1 grep 'SSLEAY_VERSION: OpenSSL 1.1' $p-self.out run-protocol-$p: $p-self.out - @echo '\n======== $@ ========' # check that OpenSSL 1.1 protocol version is TLS 1.3 grep 'Protocol *: TLSv1.3' $p-self.out diff --git a/regress/lib/libssl/interop/session/Makefile b/regress/lib/libssl/interop/session/Makefile index a99ab008a62..12d3eb2af75 100644 --- a/regress/lib/libssl/interop/session/Makefile +++ b/regress/lib/libssl/interop/session/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2020/05/11 18:20:24 jsing Exp $ +# $OpenBSD: Makefile,v 1.6 2020/12/17 00:51:11 bluhm Exp $ LIBRARIES = libressl .if exists(/usr/local/bin/eopenssl) @@ -12,7 +12,6 @@ run-session-client-libressl-server-libressl \ run-session-client-libressl-server-openssl11 \ run-session-client-openssl11-server-libressl \ run-session-client-openssl11-server-openssl11: - @echo '\n======== $@ ========' # TLS 1.3 needs some extra setup for session reuse @echo DISABLED @@ -23,7 +22,6 @@ REGRESS_TARGETS += run-session-client-${clib}-server-${slib} 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 >${@:S/^run/server/}.out \ -ss \ diff --git a/regress/lib/libssl/interop/version/Makefile b/regress/lib/libssl/interop/version/Makefile index 420b236421b..7ac86ccbeb6 100644 --- a/regress/lib/libssl/interop/version/Makefile +++ b/regress/lib/libssl/interop/version/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2020/09/21 15:13:24 beck Exp $ +# $OpenBSD: Makefile,v 1.3 2020/12/17 00:51:12 bluhm Exp $ # Connect a client to a server. Both can be current libressl, or # openssl 1.0.2, or openssl 1.1. Pin client or server to a fixed TLS @@ -41,7 +41,6 @@ run-version-client-${clib}-${cver}-server-${slib}-${sver} \ client-version-client-${clib}-${cver}-server-${slib}-${sver}.out \ server-version-client-${clib}-${cver}-server-${slib}-${sver}.out: \ 127.0.0.1.crt ../${clib}/client ../${slib}/server - @echo '\n======== $@ ========' LD_LIBRARY_PATH=/usr/local/lib/e${slib} \ ../${slib}/server >${@:S/^run/server/}.out \ -c 127.0.0.1.crt -k 127.0.0.1.key \ @@ -69,7 +68,6 @@ REGRESS_SLOW_TARGETS += check-version-client-${clib}-${cver}-server-${slib}-${sv check-version-client-${clib}-${cver}-server-${slib}-${sver}: \ client-version-client-${clib}-${cver}-server-${slib}-${sver}.out \ server-version-client-${clib}-${cver}-server-${slib}-${sver}.out - @echo '\n======== $@ ========' @grep ' Protocol *: ' ${@:S/^check/client/}.out @grep ' Protocol *: ' ${@:S/^check/server/}.out .if "${cver}" == any |