kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename -timeout to -idle-timeout.

Browse Source 
-timeout collides with go test's flags.

Change-Id: Icfc954915a61f1bb4d0acc8f02ec8a482ea10158
Reviewed-on: https://boringssl-review.googlesource.com/8188
Reviewed-by: David Benjamin <davidben@google.com>
This commit is contained in:
David Benjamin 2016-06-07 18:00:52 -04:00
parent 3dcec458f1
commit 01784b44b9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ssl/test/runner/runner.go
View File

@ -53,7 +53,7 @@ var (
resourceDir = flag.String("resource-dir", ".", "The directory in which to find certificate and key files.") resourceDir = flag.String("resource-dir", ".", "The directory in which to find certificate and key files.")
fuzzer = flag.Bool("fuzzer", false, "If true, tests against a BoringSSL built in fuzzer mode.") fuzzer = flag.Bool("fuzzer", false, "If true, tests against a BoringSSL built in fuzzer mode.")
transcriptDir = flag.String("transcript-dir", "", "The directory in which to write transcripts.") transcriptDir = flag.String("transcript-dir", "", "The directory in which to write transcripts.")
timeout = flag.Int("timeout", 15, "The number of seconds to wait for a read or write to bssl_shim.") idleTimeout = flag.Duration("idle-timeout", 15*time.Second, "The number of seconds to wait for a read or write to bssl_shim.")
) )
const ( const (
@ -315,7 +315,7 @@ func (t *timeoutConn) Write(b []byte) (int, error) {
} }
func doExchange(test *testCase, config *Config, conn net.Conn, isResume bool) error { func doExchange(test *testCase, config *Config, conn net.Conn, isResume bool) error {
conn = &timeoutConn{conn, time.Duration(*timeout) * time.Second} conn = &timeoutConn{conn, *idleTimeout}
if test.protocol == dtls { if test.protocol == dtls {
config.Bugs.PacketAdaptor = newPacketAdaptor(conn) config.Bugs.PacketAdaptor = newPacketAdaptor(conn)