Merge branch 'tmp-fix-pha-pkcs11-test' into 'master'

tests: fix race condition in tls13/post-handshake-with-cert-pkcs11

See merge request gnutls/gnutls!977

1 files changed, 5 insertions, 2 deletions

diff --git a/tests/tls13/post-handshake-with-cert-pkcs11.c b/tests/tls13/post-handshake-with-cert-pkcs11.c
index ca78ade689..01aa2d08a7 100644
--- a/tests/tls13/post-handshake-with-cert-pkcs11.c
+++ b/tests/tls13/post-handshake-with-cert-pkcs11.c
@@ -427,13 +427,13 @@ void start(const char *name, int err, int cli_err, int type)
 	if (child) {
 		/* parent */
 		close(fd[1]);
-		client(fd[0], cli_err);
+		server(fd[0], err, type);
 		kill(child, SIGTERM);
 		wait(&status);
 		check_wait_status(status);
 	} else {
 		close(fd[0]);
-		server(fd[1], err, type);
+		client(fd[1], cli_err);
 		exit(0);
 	}
 
@@ -444,6 +444,9 @@ void doit(void)
 	const char *bin;
 	char buf[128];
 
+	/* check if softhsm module is loadable */
+	(void) softhsm_lib();
+
 	/* initialize SoftHSM token that libpkcs11mock2.so internally uses */
 	bin = softhsm_bin();