Merge remote branch 'cros/upstream' into master

client/tests/unixbench/unixbench.py

 import os, re
 from autotest_lib.client.bin import test, utils
 from autotest_lib.client.common_lib import error
 
 
 class unixbench(test.test):
     version = 2
 
     def initialize(self):
         self.job.require_gcc()
         self.err = None
 
 
     # http://www.tux.org/pub/tux/niemi/unixbench/unixbench-4.1.0.tgz
     def setup(self, tarball = 'unixbench-4.1.0.tar.bz2'):
         tarball = utils.unmap_url(self.bindir, tarball, self.tmpdir)
         utils.extract_tarball_to_dir(tarball, self.srcdir)
         os.chdir(self.srcdir)
 
         utils.system('patch -p1 < ../unixbench.patch')
         utils.system('patch -p1 < ../Makefile.patch')
-        utils.system('make')
+        utils.make()
         utils.system('rm pgms/select')
 
 
     def run_once(self, args='', stepsecs=0):
         vars = ('TMPDIR=\"%s\" RESULTDIR=\"%s\" FLAVOR=Linux' %
                (self.tmpdir, self.resultsdir))
         if stepsecs:
             # change time per subtest from unixbench's defaults of
             #   10 secs for small tests, 30 secs for bigger tests
             vars += ' systime=%i looper=%i seconds=%i'\
                     ' dhrytime=%i arithtime=%i' \
                     % ((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:]
 
 
     def cleanup(self):
         # check err string and possible throw
         if self.err is not None:
             raise error.TestError(self.err)
 
@@ skipping 82 matching lines @@
 File Copy 256 bufsize 500 maxblocks           1655.0   143989.0      870.0
 File Copy 4096 bufsize 8000 maxblocks         5800.0   793041.0     1367.3
 Pipe Throughput                              12440.0  1048491.9      842.8
 Pipe-based Context Switching                  4000.0   300778.3      751.9
 Process Creation                               126.0    11508.6      913.4
 Shell Scripts (8 concurrent)                     6.0     1109.0     1848.3
 System Call Overhead                         15000.0  1427272.7      951.5
                                                                  =========
      FINAL SCORE                                                     902.1
 """