Merge remote branch 'cros/upstream' into tempbranch3

client/tests/iperf/iperf.py

 import os, re, socket, time, logging
 from autotest_lib.client.bin import test, utils
 from autotest_lib.client.bin.net import net_utils
 from autotest_lib.client.common_lib import error
 
 MPSTAT_IX = 0
 IPERF_IX = 1
 
 class iperf(test.test):
     version = 2
 
     # http://downloads.sourceforge.net/iperf/iperf-2.0.4.tar.gz
     def setup(self, tarball = 'iperf-2.0.4.tar.gz'):
         self.job.require_gcc()
         tarball = utils.unmap_url(self.bindir, tarball, self.tmpdir)
         utils.extract_tarball_to_dir(tarball, self.srcdir)
 
         self.job.setup_dep(['sysstat'])
 
         os.chdir(self.srcdir)
         utils.configure()
-        utils.system('make')
+        utils.make()
         utils.system('sync')
 
 
     def initialize(self):
         self.SERVER_PORT = '5001'
 
         # The %%s is to add extra args later
         # We cannot use daemon mode because it is unreliable with
         # UDP transfers.
         self.server_path = "%s %%s&" % os.path.join(self.srcdir,
@@ skipping 242 matching lines @@
 
                 if keyval['CPU_C']:
                     keyval['Efficiency_C'] = total_bw/keyval['CPU_C']
                 else:
                     keyval['Efficiency_C'] = total_bw
                 self.write_iteration_keyval(attr, keyval)
         else:
             # This test currently does not produce a keyval file on the
             # server side. This should be implemented eventually.
             logging.info(self.results)