Merge remote branch 'cros/upstream' into tempbranch3

client/tests/qemu_iotests/qemu_iotests.py

 import os, re, logging
 from autotest_lib.client.bin import test, utils, os_dep
 from autotest_lib.client.common_lib import error
 
 
 class qemu_iotests(test.test):
     """
     This autotest module runs the qemu_iotests testsuite.
 
     @copyright: Red Hat 2009
@@ skipping 16 matching lines @@
 
     def setup(self, tarball='qemu-iotests.tar.bz2'):
         """
         Uncompresses the tarball and cleans any leftover output files.
 
         @param tarball: Relative path to the testsuite tarball.
         """
         tarball = utils.unmap_url(self.bindir, tarball, self.tmpdir)
         utils.extract_tarball_to_dir(tarball, self.srcdir)
         os.chdir(self.srcdir)
-        utils.system("make clean")
+        utils.make('clean')
 
 
     def run_once(self, options='', testlist=''):
         """
         Passes the appropriate parameters to the testsuite.
 
         # Usage: $0 [options] [testlist]
         # check options
         #     -raw                test raw (default)
         #     -cow                test cow
@@ skipping 42 matching lines @@
                 if failed_cases:
                     e_msg = ("Qemu-iotests failed. Failed cases: %s" %
                              failed_cases)
                 else:
                     e_msg = "Qemu-iotests failed"
                 raise error.TestFail(e_msg)
         finally:
             src = os.path.join(self.srcdir, "check.log")
             dest = os.path.join(self.resultsdir, "check.log")
             utils.get_file(src, dest)