Merge remote branch 'cros/upstream' into tempbranch

client/tests/tiobench/tiobench.py

Index: client/tests/tiobench/tiobench.py
diff --git a/client/tests/tiobench/tiobench.py b/client/tests/tiobench/tiobench.py
index e0693aa40eece3c4fdd1f3ce13143ae30473043c..747fc26e395b68bd03211754b973e01ad9d71396 100644
--- a/client/tests/tiobench/tiobench.py
+++ b/client/tests/tiobench/tiobench.py
@@ -1,4 +1,4 @@
-import os
+import os, logging
 from autotest_lib.client.bin import test, utils
 
 
@@ -29,4 +29,11 @@ class tiobench(test.test):
             self.args = args
 
         os.chdir(self.srcdir)
-        utils.system('./tiobench.pl --dir %s %s' %(self.dir, self.args))
+        results = utils.system_output('./tiobench.pl --dir %s %s' %
+                                      (self.dir, self.args))
+
+        logging.info(results)
+        results_path = os.path.join(self.resultsdir,
+                                    'raw_output_%s' % self.iteration)
+
+        utils.open_write_close(results_path, results)