Merge remote branch 'cros/upstream' into master

client/tests/unixbench/unixbench.py

Index: client/tests/unixbench/unixbench.py
diff --git a/client/tests/unixbench/unixbench.py b/client/tests/unixbench/unixbench.py
index b3fe920c0507e85f59bc510af70698725cf2b633..9983cec59dbc013730251ec25310b93256975a37 100644
--- a/client/tests/unixbench/unixbench.py
+++ b/client/tests/unixbench/unixbench.py
@@ -19,7 +19,7 @@ class unixbench(test.test):
 
         utils.system('patch -p1 < ../unixbench.patch')
         utils.system('patch -p1 < ../Makefile.patch')
-        utils.system('make')
+        utils.make()
         utils.system('rm pgms/select')
 
 
@@ -34,7 +34,15 @@ class unixbench(test.test):
                     % ((stepsecs,)*5)
 
         os.chdir(self.srcdir)
-        utils.system(vars + ' ./Run ' + args)
+        try:
+            utils.system(vars + ' ./Run ' + args)
+        finally:
+            times_path = os.path.join(self.resultsdir, 'times')
+            # The 'times' file can be needlessly huge as it contains warnings
+            # and error messages printed out by small benchmarks that are
+            # run in a loop.  It can easily compress 100x in such cases.
+            if os.path.exists(times_path):
+                utils.system("gzip -9 '%s'" % (times_path,), ignore_status=True)
 
         report_path = os.path.join(self.resultsdir, 'report')
         self.report_data = open(report_path).readlines()[9:]