Merge remote branch 'cros/upstream' into master

client/tests/kernbench/kernbench.py

Index: client/tests/kernbench/kernbench.py
diff --git a/client/tests/kernbench/kernbench.py b/client/tests/kernbench/kernbench.py
index a22a67130eb32014386336a1dbcbe3205d441801..ccde09ffe5ae4c811b7c3f3bc92eeceeb07eaeb0 100644
--- a/client/tests/kernbench/kernbench.py
+++ b/client/tests/kernbench/kernbench.py
@@ -49,10 +49,13 @@ class kernbench(test.test):
             self.threads = self.job.cpu_count()*2
 
         self.kernel = self.__init_tree(version)
-        logfile = os.path.join(self.debugdir, 'build_log')
-
         logging.info("Warmup run ...")
-        self.kernel.build_timed(self.threads, output=logfile)      # warmup run
+        logfile = os.path.join(self.debugdir, 'build_log')
+        try:
+            self.kernel.build_timed(self.threads, output=logfile)  # warmup run
+        finally:
+            if os.path.exists(logfile):
+                utils.system("gzip -9 '%s'" % logfile, ignore_status=True)
 
 
     def run_once(self):