| commit | 812152aa3b6404b139135096fa22c06d9910f68e | [log] [tgz] |
|---|---|---|
| author | David Benjamin <davidben@chromium.org> | Sat Sep 06 12:49:07 2014 -0400 |
| committer | Adam Langley <agl@google.com> | Mon Sep 15 21:08:11 2014 +0000 |
| tree | e5dcb69099f968ae90894e9677f61f21dede2c3b | |
| parent | e78bfded9f24725c47e0f5d0a64465566c3bdcf2 [diff] |
Don't deadlock if a resume test fails the first half. Otherwise the child is busy waiting for its second handshake. Change-Id: Ic613eeb04c5d6c1ec1e1bbcb13946d3ac31d05f1 Reviewed-on: https://boringssl-review.googlesource.com/1752 Reviewed-by: Adam Langley <agl@google.com>
diff --git a/ssl/test/runner/runner.go b/ssl/test/runner/runner.go index ae74464..0a5888c 100644 --- a/ssl/test/runner/runner.go +++ b/ssl/test/runner/runner.go
@@ -679,8 +679,8 @@ conn.Close() if err == nil && test.resumeSession { err = doExchange(test, &config, connResume, test.messageLen) - connResume.Close() } + connResume.Close() childErr := shim.Wait()