Merge remote branch 'cros/upstream' into tempbranch3

client/tests/iozone/iozone.py

 import os, re
 from autotest_lib.client.bin import test, utils
 import postprocessing
 
 
 class iozone(test.test):
     """
     This autotest module runs the IOzone filesystem benchmark. The benchmark
     generates and measures a variety of file operations. Iozone has been ported
     to many machines and runs under many operating systems.
@@ skipping 19 matching lines @@
         Builds the given version of IOzone from a tarball.
         @param tarball: Tarball with IOzone
         @see: http://www.iozone.org/src/current/iozone3_347.tar
         """
         tarball = utils.unmap_url(self.bindir, tarball, self.tmpdir)
         utils.extract_tarball_to_dir(tarball, self.srcdir)
         os.chdir(os.path.join(self.srcdir, 'src/current'))
 
         arch = utils.get_current_kernel_arch()
         if (arch == 'ppc'):
-            utils.system('make linux-powerpc')
+            utils.make('linux-powerpc')
         elif (arch == 'ppc64'):
-            utils.system('make linux-powerpc64')
+            utils.make('linux-powerpc64')
         elif (arch == 'x86_64'):
-            utils.system('make linux-AMD64')
+            utils.make('linux-AMD64')
         else:
-            utils.system('make linux')
+            utils.make('linux')
 
 
     def run_once(self, dir=None, args=None):
         """
         Runs IOzone with appropriate parameters, record raw results in a per
         iteration raw output file as well as in the results attribute
 
         @param dir: IOzone file generation dir.
         @param args: Arguments to the iozone program.
         """
@@ skipping 100 matching lines @@
 
     def postprocess_iteration(self):
         self.generate_keyval()
         if self.auto_mode:
             a = postprocessing.IOzoneAnalyzer(list_files=[self.results_path],
                                               output_dir=self.analysisdir)
             a.analyze()
             p = postprocessing.IOzonePlotter(results_file=self.results_path,
                                              output_dir=self.analysisdir)
             p.plot_all()