Merge remote branch 'cros/upstream' into tempbranch3

client/tests/lmbench/lmbench.py

 # This will need more work on the configuration stuff before it will function
 import os
 from autotest_lib.client.bin import test, utils
 from autotest_lib.client.common_lib import error
 
 
 class lmbench(test.test):
     version = 4
 
     def initialize(self):
@@ skipping 16 matching lines @@
         """
         tarball = utils.unmap_url(self.bindir, tarball, self.tmpdir)
         utils.extract_tarball_to_dir(tarball, self.srcdir)
         os.chdir(self.srcdir)
         p1 = 'patch -p1 < ../0001-Fix-build-issues-with-lmbench.patch'
         p2 = 'patch -p1 < ../0002-Changing-shebangs-on-lmbench-scripts.patch'
         utils.system(p1)
         utils.system(p2)
 
         # build lmbench
-        utils.system('make')
+        utils.make()
 
         # configure lmbench
         utils.system('yes "" | make config')
 
         # find the lmbench config file
         config_files = utils.system_output('ls -1 bin/*/CONFIG*').splitlines()
         if len(config_files) != 1:
             raise error.TestError('Failed to find a single lmbench config file,'
                                   ' found: %s' % config_files)
         config_file = config_files[0]
 
         if not fsdir:
             fsdir = self.tmpdir
         if not file:
             file = os.path.join(self.tmpdir, 'XXX')
 
         # patch the resulted config to use the proper temporary directory and
         # file locations
         tmp_config_file = config_file + '.tmp'
         utils.system("sed 's!^FSDIR=.*$!FSDIR=%s!' '%s' > '%s'" %
                      (fsdir, config_file, tmp_config_file))
         utils.system("sed 's!^FILE=.*$!FILE=%s!' '%s' > '%s'" %
                      (file, tmp_config_file, config_file))
 
 
     def run_once(self):
         os.chdir(self.srcdir)
-        utils.system('make rerun')
+        utils.make('rerun')
 
 
     def postprocess(self):
         # Get the results:
         outputdir = self.srcdir + "/results"
         results = self.resultsdir + "/summary.txt"
-        utils.system("make -C " + outputdir + " summary > " + results)
+        utils.make("-C " + outputdir + " summary > " + results)