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/session | |
| 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/session')
| -rw-r--r-- | src/regress/lib/libssl/interop/session/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/regress/lib/libssl/interop/session/Makefile b/src/regress/lib/libssl/interop/session/Makefile index 072fa1b93c..c82440d785 100644 --- a/src/regress/lib/libssl/interop/session/Makefile +++ b/src/regress/lib/libssl/interop/session/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: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) |
| @@ -29,7 +29,8 @@ run-session-client-${clib}-server-${slib}: \ | |||
| 29 | ../${clib}/client >${@:S/^run/client/}.out \ | 29 | ../${clib}/client >${@:S/^run/client/}.out \ |
| 30 | -ss \ | 30 | -ss \ |
| 31 | `sed -n 's/listen sock: //p' ${@:S/^run/server/}.out` | 31 | `sed -n 's/listen sock: //p' ${@:S/^run/server/}.out` |
| 32 | grep '^success$$' ${@:S/^run/server/}.out | 32 | grep '^success$$' ${@:S/^run/server/}.out || \ |
| 33 | { sleep 1; grep '^success$$' ${@:S/^run/server/}.out; } | ||
| 33 | grep '^success$$' ${@:S/^run/client/}.out | 34 | grep '^success$$' ${@:S/^run/client/}.out |
| 34 | grep '^session 2: new$$' ${@:S/^run/server/}.out | 35 | grep '^session 2: new$$' ${@:S/^run/server/}.out |
| 35 | grep '^session 2: new$$' ${@:S/^run/client/}.out | 36 | grep '^session 2: new$$' ${@:S/^run/client/}.out |
