external/boringssl: Sync to 040bc4944be97f5d4b44da176f6e801fc804a176.
This includes the following changes:
https://boringssl.googlesource.com/boringssl/+log/ab20cec1c1de815de8da6cc74c2503460efd6e1c..040bc4944be97f5d4b44da176f6e801fc804a176
Test: Libcore CTS presubmits
Change-Id: I0667fbfb5c64ab68a3482c226c9ad12788f6806c
diff --git a/src/util/all_tests.go b/src/util/all_tests.go
index d4bb802..3cf2320 100644
--- a/src/util/all_tests.go
+++ b/src/util/all_tests.go
@@ -186,10 +186,9 @@
} else {
cmd = exec.Command(prog, args...)
}
- var stdoutBuf bytes.Buffer
- var stderrBuf bytes.Buffer
- cmd.Stdout = &stdoutBuf
- cmd.Stderr = &stderrBuf
+ var outBuf bytes.Buffer
+ cmd.Stdout = &outBuf
+ cmd.Stderr = &outBuf
if mallocNumToFail >= 0 {
cmd.Env = os.Environ()
cmd.Env = append(cmd.Env, "MALLOC_NUMBER_TO_FAIL="+strconv.FormatInt(mallocNumToFail, 10))
@@ -208,13 +207,12 @@
return false, errMoreMallocs
}
}
- fmt.Print(string(stderrBuf.Bytes()))
+ fmt.Print(string(outBuf.Bytes()))
return false, err
}
- fmt.Print(string(stderrBuf.Bytes()))
// Account for Windows line-endings.
- stdout := bytes.Replace(stdoutBuf.Bytes(), []byte("\r\n"), []byte("\n"), -1)
+ stdout := bytes.Replace(outBuf.Bytes(), []byte("\r\n"), []byte("\n"), -1)
if bytes.HasSuffix(stdout, []byte("PASS\n")) &&
(len(stdout) == 5 || stdout[len(stdout)-6] == '\n') {
@@ -228,6 +226,7 @@
return true, nil
}
+ fmt.Print(string(outBuf.Bytes()))
return false, nil
}