diff --git a/ssl/test/bssl_shim.cc b/ssl/test/bssl_shim.cc index 660cf2112..d439cb558 100644 --- a/ssl/test/bssl_shim.cc +++ b/ssl/test/bssl_shim.cc @@ -1101,7 +1101,6 @@ static void MessageCallback(int is_write, int version, int content_type, // Connect returns a new socket connected to localhost on |port| or -1 on // error. static int Connect(uint16_t port) { - time_t start_time = time(nullptr); for (int af : { AF_INET6, AF_INET }) { int sock = socket(af, SOCK_STREAM, 0); if (sock == -1) { @@ -1148,11 +1147,6 @@ static int Connect(uint16_t port) { } PrintSocketError("connect"); - // TODO(davidben): Remove this logging when https://crbug.com/boringssl/199 is - // resolved. - fprintf(stderr, "start_time = %lld, end_time = %lld\n", - static_cast(start_time), - static_cast(time(nullptr))); return -1; } diff --git a/ssl/test/runner/runner.go b/ssl/test/runner/runner.go index df693c7bd..d34eaa687 100644 --- a/ssl/test/runner/runner.go +++ b/ssl/test/runner/runner.go @@ -901,28 +901,20 @@ var ( // exit first. func acceptOrWait(listener *net.TCPListener, waitChan chan error) (net.Conn, error) { type connOrError struct { - conn net.Conn - err error - startTime, endTime time.Time + conn net.Conn + err error } connChan := make(chan connOrError, 1) go func() { - startTime := time.Now() if !*useGDB { listener.SetDeadline(time.Now().Add(*idleTimeout)) } conn, err := listener.Accept() - endTime := time.Now() - connChan <- connOrError{conn, err, startTime, endTime} + connChan <- connOrError{conn, err} close(connChan) }() select { case result := <-connChan: - if result.err != nil { - // TODO(davidben): Remove this logging when - // https://crbug.com/boringssl/199 is resolved. - fmt.Fprintf(os.Stderr, "acceptOrWait failed, startTime=%v, endTime=%v\n", result.startTime, result.endTime) - } return result.conn, result.err case childErr := <-waitChan: waitChan <- childErr