Merge remote branch 'cros/upstream' into master

client/tests/tbench/tbench.py

Index: client/tests/tbench/tbench.py
diff --git a/client/tests/tbench/tbench.py b/client/tests/tbench/tbench.py
index 510bc2f58c74270b7c4338ee5301bf46205e9908..79466a337002b39fb3bc9a4713d0129e38687620 100644
--- a/client/tests/tbench/tbench.py
+++ b/client/tests/tbench/tbench.py
@@ -32,7 +32,9 @@ class tbench(test.test):
             client = self.srcdir + '/client.txt'
             args = '-c ' + client + ' ' + '%s' % args
             cmd = os.path.join(self.srcdir, "tbench") + " " + args
-            self.results = utils.system_output(cmd, retain_output=True)
+            # Standard output is verbose and merely makes our debug logs huge
+            # so we don't retain it.  It gets parsed for the results.
+            self.results = utils.run(cmd, stderr_tee=utils.TEE_TO_LOGS).stdout
             os.kill(pid, signal.SIGTERM)    # clean up the server
         else:                           # child
             server = self.srcdir + '/tbench_srv'