Merge remote branch 'cros/upstream' into tempbranch3

client/tests/netperf2/netperf2.py

 import os, time, re, 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
 NETPERF_IX = 1
 
 class netperf2(test.test):
     version = 4
 
     # ftp://ftp.netperf.org/netperf/netperf-2.4.5.tar.bz2
     def setup(self, tarball = 'netperf-2.4.5.tar.bz2'):
         self.job.require_gcc()
         tarball = utils.unmap_url(self.bindir, tarball, self.tmpdir)
         utils.extract_tarball_to_dir(tarball, self.srcdir)
         os.chdir(self.srcdir)
 
         utils.system('patch -p0 < ../wait_before_data.patch')
         utils.configure()
-        utils.system('make')
+        utils.make()
         utils.system('sync')
 
         self.job.setup_dep(['sysstat'])
 
 
     def initialize(self):
         self.server_prog = '%s&' % os.path.join(self.srcdir, 'src/netserver')
         self.client_prog = '%s' % os.path.join(self.srcdir, 'src/netperf')
         self.valid_tests = ['TCP_STREAM', 'TCP_MAERTS', 'TCP_RR', 'TCP_CRR',
                             'TCP_SENDFILE', 'UDP_STREAM', 'UDP_RR']
@@ skipping 309 matching lines @@
         end_time = curr_time + timeout
         while curr_time < end_time:
             if not os.system('ping -c 1 ' + ip):
                 # Ping succeeded
                 return
             # Ping failed. Lets sleep a bit and try again.
             time.sleep(5)
             curr_time = time.time()
 
         return