summaryrefslogtreecommitdiff
path: root/src/regress/lib/libssl/interop/cert
diff options
context:
space:
mode:
authorbluhm <>2018-11-11 07:39:35 +0000
committerbluhm <>2018-11-11 07:39:35 +0000
commit9d5c4cde0bb42b8c97a5ce1d45cdd02553c151fa (patch)
tree337aa7e81a2fca60651495993eea8756fd7000c9 /src/regress/lib/libssl/interop/cert
parentedf0ee57ace922fc1f6c610bc8386f145051dfdf (diff)
downloadopenbsd-9d5c4cde0bb42b8c97a5ce1d45cdd02553c151fa.tar.gz
openbsd-9d5c4cde0bb42b8c97a5ce1d45cdd02553c151fa.tar.bz2
openbsd-9d5c4cde0bb42b8c97a5ce1d45cdd02553c151fa.zip
Fix a race in libssl interop regress. The success messages from
the server child could be delayed. In this case wait a second and check again.
Diffstat (limited to 'src/regress/lib/libssl/interop/cert')
-rw-r--r--src/regress/lib/libssl/interop/cert/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/regress/lib/libssl/interop/cert/Makefile b/src/regress/lib/libssl/interop/cert/Makefile
index 911fe8c325..3e7a07cdfe 100644
--- a/src/regress/lib/libssl/interop/cert/Makefile
+++ b/src/regress/lib/libssl/interop/cert/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.2 2018/11/11 00:15:04 bluhm Exp $ 1# $OpenBSD: Makefile,v 1.3 2018/11/11 07:39:34 bluhm Exp $
2 2
3LIBRARIES = libressl 3LIBRARIES = libressl
4.if exists(/usr/local/bin/eopenssl) 4.if exists(/usr/local/bin/eopenssl)
@@ -50,7 +50,8 @@ run-cert-client-${clib}-${cca}-${ccert}-${cv}-server-${slib}-${sca}-${scert}-${s
50 ${cv:S/^noverify//:S/^verify/-v/} \ 50 ${cv:S/^noverify//:S/^verify/-v/} \
51 `sed -n 's/listen sock: //p' ${@:S/^run/server/}.out` 51 `sed -n 's/listen sock: //p' ${@:S/^run/server/}.out`
52.if empty(${FAIL_${cca}_${sca}_${ccert}_${scert}_${cv}_${sv}}) 52.if empty(${FAIL_${cca}_${sca}_${ccert}_${scert}_${cv}_${sv}})
53 grep '^success$$' ${@:S/^run/server/}.out 53 grep '^success$$' ${@:S/^run/server/}.out || \
54 { sleep 1; grep '^success$$' ${@:S/^run/server/}.out; }
54 grep '^success$$' ${@:S/^run/client/}.out 55 grep '^success$$' ${@:S/^run/client/}.out
55.elif ! ("${sv}" == certverify && "${ccert}" == nocert) || \ 56.elif ! ("${sv}" == certverify && "${ccert}" == nocert) || \
56 ("${cv}" == verify && "${scert}" != cert) 57 ("${cv}" == verify && "${scert}" != cert)