Merge remote branch 'cros/upstream' into tempbranch3

client/tests/sysbench/sysbench.py

 import os, time, re, pwd
 from autotest_lib.client.bin import test, utils
 from autotest_lib.client.common_lib import error
 
 
 class sysbench(test.test):
     version = 1
 
     def initialize(self):
         self.job.require_gcc()
         self.results = []
 
     # http://osdn.dl.sourceforge.net/sourceforge/sysbench/sysbench-0.4.8.tar.gz
     def setup(self, tarball = 'sysbench-0.4.8.tar.bz2'):
         tarball = utils.unmap_url(self.bindir, tarball, self.tmpdir)
         utils.extract_tarball_to_dir(tarball, self.srcdir)
         self.job.setup_dep(['pgsql', 'mysql'])
 
         os.chdir(self.srcdir)
 
         pgsql_dir = os.path.join(self.autodir, 'deps/pgsql/pgsql')
         mysql_dir = os.path.join(self.autodir, 'deps/mysql/mysql')
 
         # configure wants to get at pg_config, so add its path
         utils.system(
             'PATH=%s/bin:$PATH ./configure --with-mysql=%s --with-pgsql'
             % (pgsql_dir, mysql_dir))
-        utils.system('make -j %d' % utils.count_cpus())
+        utils.make('-j %d' % utils.count_cpus())
 
 
     def run_once(self, db_type = 'pgsql', build = 1, \
                     num_threads = utils.count_cpus(), max_time = 60, \
                     read_only = 0, args = ''):
         plib = os.path.join(self.autodir, 'deps/pgsql/pgsql/lib')
         mlib = os.path.join(self.autodir, 'deps/mysql/mysql/lib/mysql')
         ld_path = utils.prepend_path(plib,
             utils.environ('LD_LIBRARY_PATH'))
         ld_path = utils.prepend_path(mlib, ld_path)
@@ skipping 119 matching lines @@
             if threads_re:
                 threads = threads_re.group(1)
 
             tps_re = re.search('transactions:\s+\d+\s+\((\S+) per sec.\)', line)
             if tps_re:
                 tps = tps_re.group(1)
                 break
 
         out.write('threads=%s\ntps=%s' % (threads, tps))
         out.close()