From 9d5c4cde0bb42b8c97a5ce1d45cdd02553c151fa Mon Sep 17 00:00:00 2001
From: bluhm <>
Date: Sun, 11 Nov 2018 07:39:35 +0000
Subject: 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.

---
 src/regress/lib/libssl/interop/cert/Makefile    | 5 +++--
 src/regress/lib/libssl/interop/netcat/Makefile  | 5 +++--
 src/regress/lib/libssl/interop/session/Makefile | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'src')

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 @@
-# $OpenBSD: Makefile,v 1.2 2018/11/11 00:15:04 bluhm Exp $
+# $OpenBSD: Makefile,v 1.3 2018/11/11 07:39:34 bluhm Exp $
 
 LIBRARIES =		libressl
 .if exists(/usr/local/bin/eopenssl)
@@ -50,7 +50,8 @@ run-cert-client-${clib}-${cca}-${ccert}-${cv}-server-${slib}-${sca}-${scert}-${s
 	    ${cv:S/^noverify//:S/^verify/-v/} \
 	    `sed -n 's/listen sock: //p' ${@:S/^run/server/}.out`
 .if empty(${FAIL_${cca}_${sca}_${ccert}_${scert}_${cv}_${sv}})
-	grep '^success$$' ${@:S/^run/server/}.out
+	grep '^success$$' ${@:S/^run/server/}.out || \
+	    { sleep 1; grep '^success$$' ${@:S/^run/server/}.out; }
 	grep '^success$$' ${@:S/^run/client/}.out
 .elif ! ("${sv}" == certverify && "${ccert}" == nocert) || \
     ("${cv}" == verify && "${scert}" != cert)
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 @@
-# $OpenBSD: Makefile,v 1.1 2018/11/11 00:15:04 bluhm Exp $
+# $OpenBSD: Makefile,v 1.2 2018/11/11 07:39:35 bluhm Exp $
 
 LIBRARIES =		libressl
 .if exists(/usr/local/bin/eopenssl)
@@ -52,7 +52,8 @@ run-netcat-client-nc-server-${slib}: ../${slib}/server 127.0.0.1.crt
 	    -c -R 127.0.0.1.crt \
 	    `sed -n 's/listen sock: //p' ${@:S/^run/server/}.out`
 	# check that the server child run successfully to the end
-	grep -q '^success$$' ${@:S/^run/server/}.out
+	grep -q '^success$$' ${@:S/^run/server/}.out || \
+	    { sleep 1; grep -q '^success$$' ${@:S/^run/server/}.out; }
 	# server must have read client hello
 	grep -q '^<<< hello$$' ${@:S/^run/server/}.out
 	# client must have read server greeting
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 @@
-# $OpenBSD: Makefile,v 1.2 2018/11/11 00:15:04 bluhm Exp $
+# $OpenBSD: Makefile,v 1.3 2018/11/11 07:39:35 bluhm Exp $
 
 LIBRARIES =		libressl
 .if exists(/usr/local/bin/eopenssl)
@@ -29,7 +29,8 @@ run-session-client-${clib}-server-${slib}: \
 	    ../${clib}/client >${@:S/^run/client/}.out \
 	    -ss \
 	    `sed -n 's/listen sock: //p' ${@:S/^run/server/}.out`
-	grep '^success$$' ${@:S/^run/server/}.out
+	grep '^success$$' ${@:S/^run/server/}.out || \
+	    { sleep 1; grep '^success$$' ${@:S/^run/server/}.out; }
 	grep '^success$$' ${@:S/^run/client/}.out
 	grep '^session 2: new$$' ${@:S/^run/server/}.out
 	grep '^session 2: new$$' ${@:S/^run/client/}.out
-- 
cgit v1.2.3-55-g6feb