Merge remote branch 'cros/upstream' into tempbranch3

client/tests/netpipe/netpipe.py

 import os, time, logging
 from autotest_lib.client.bin import test, utils
 from autotest_lib.client.common_lib import error
 
 
 class netpipe(test.test):
     version = 1
     NP_FILE = '/tmp/np.out'
 
     # http://www.scl.ameslab.gov/netpipe/code/NetPIPE-3.7.1.tar.gz
     def setup(self, tarball='NetPIPE-3.7.1.tar.gz'):
         tarball = utils.unmap_url(self.bindir, tarball, self.tmpdir)
         utils.extract_tarball_to_dir(tarball, self.srcdir)
         os.chdir(self.srcdir)
         utils.system('patch -p1 < ../makefile.patch')
-        utils.system('make')
+        utils.make()
 
 
     def initialize(self):
         self.job.require_gcc()
 
         # Add arguments later
         self.server_path = '%s %%s' % os.path.join(self.srcdir, 'NPtcp')
         # Add server_ip and arguments later
         base_path = os.path.join(self.srcdir, 'NPtcp -h')
         self.client_path = '%s %%s -o %s %%s' % (base_path, self.NP_FILE)
@@ skipping 75 matching lines @@
             try:
                 output = open(self.NP_FILE)
                 for line in output.readlines():
                     buff, bandwidth, latency = line.split()
                     attr = {'buffer_size':buff}
                     keyval = {'bandwidth':bandwidth, 'latency':latency}
                     self.write_iteration_keyval(attr, keyval)
             finally:
                 output.close()
                 os.remove(self.NP_FILE)