diff options
author | bluhm <> | 2018-11-11 07:39:35 +0000 |
---|---|---|
committer | bluhm <> | 2018-11-11 07:39:35 +0000 |
commit | 9d5c4cde0bb42b8c97a5ce1d45cdd02553c151fa (patch) | |
tree | 337aa7e81a2fca60651495993eea8756fd7000c9 /src/regress/lib/libssl/interop/netcat | |
parent | edf0ee57ace922fc1f6c610bc8386f145051dfdf (diff) | |
download | openbsd-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/netcat')
-rw-r--r-- | src/regress/lib/libssl/interop/netcat/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/regress/lib/libssl/interop/netcat/Makefile b/src/regress/lib/libssl/interop/netcat/Makefile index def90c1ffb..80f49c52f0 100644 --- a/src/regress/lib/libssl/interop/netcat/Makefile +++ b/src/regress/lib/libssl/interop/netcat/Makefile | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: Makefile,v 1.1 2018/11/11 00:15:04 bluhm Exp $ | 1 | # $OpenBSD: Makefile,v 1.2 2018/11/11 07:39:35 bluhm Exp $ |
2 | 2 | ||
3 | LIBRARIES = libressl | 3 | LIBRARIES = libressl |
4 | .if exists(/usr/local/bin/eopenssl) | 4 | .if exists(/usr/local/bin/eopenssl) |
@@ -52,7 +52,8 @@ run-netcat-client-nc-server-${slib}: ../${slib}/server 127.0.0.1.crt | |||
52 | -c -R 127.0.0.1.crt \ | 52 | -c -R 127.0.0.1.crt \ |
53 | `sed -n 's/listen sock: //p' ${@:S/^run/server/}.out` | 53 | `sed -n 's/listen sock: //p' ${@:S/^run/server/}.out` |
54 | # check that the server child run successfully to the end | 54 | # check that the server child run successfully to the end |
55 | grep -q '^success$$' ${@:S/^run/server/}.out | 55 | grep -q '^success$$' ${@:S/^run/server/}.out || \ |
56 | { sleep 1; grep -q '^success$$' ${@:S/^run/server/}.out; } | ||
56 | # server must have read client hello | 57 | # server must have read client hello |
57 | grep -q '^<<< hello$$' ${@:S/^run/server/}.out | 58 | grep -q '^<<< hello$$' ${@:S/^run/server/}.out |
58 | # client must have read server greeting | 59 | # client must have read server greeting |