From 01784b44b9096255a3ab7e33e7b24c4814c366f7 Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Tue, 7 Jun 2016 18:00:52 -0400 Subject: [PATCH] Rename -timeout to -idle-timeout. -timeout collides with go test's flags. Change-Id: Icfc954915a61f1bb4d0acc8f02ec8a482ea10158 Reviewed-on: https://boringssl-review.googlesource.com/8188 Reviewed-by: David Benjamin --- ssl/test/runner/runner.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ssl/test/runner/runner.go b/ssl/test/runner/runner.go index 71d14d2a..f70999b7 100644 --- a/ssl/test/runner/runner.go +++ b/ssl/test/runner/runner.go @@ -53,7 +53,7 @@ var ( 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.") 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 ( @@ -315,7 +315,7 @@ func (t *timeoutConn) Write(b []byte) (int, 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 { config.Bugs.PacketAdaptor = newPacketAdaptor(conn)