Merge remote branch 'cros/upstream' into tempbranch3

client/tests/cerberus/cerberus.py

 import os, shutil, glob, logging
 from autotest_lib.client.bin import test, utils
 from autotest_lib.client.common_lib import error
 
 class cerberus(test.test):
     """
     This autotest module runs CTCS2 (Cerberus Test Control System 2), which
     intents to revive the original CTCS project.
 
     The original test suite (Cerberus Test Control System) was developed for
@@ skipping 35 matching lines @@
         os.chdir(self.srcdir)
         # Apply patch to fix build problems on newer distros (absence of
         # asm/page.h include, and platform(32/64bit) related issues.
         p1 = 'patch -p1 < ../0001-Fix-CTCS2-Build.patch'
         utils.system(p1)
 
         if utils.get_cpu_arch() == 'x86_64':
             p2 = 'patch -p1 < ../0002-Fix-CTCS2-build-in-64-bit-boxes.patch'
             utils.system(p2)
 
-        utils.system('make')
+        utils.make()
 
         # Here we define the cerberus suite control file that will be used.
         # It will be kept on the debug directory for further analysis.
         self.tcf_path = os.path.join(self.debugdir, 'autotest.tcf')
 
         if not tcf_contents:
             logging.info('Generating cerberus control file')
             # Note about the control file generation command - we are creating
             # a control file with the default tests, except for the kernel
             # compilation test (flag -k).
@@ skipping 33 matching lines @@
 
 
     def cleanup(self):
         """
         Cleans up source directory and raises on failure.
         """
         if os.path.isdir(self.srcdir):
             shutil.rmtree(self.srcdir)
         if self.nfail != 0:
             raise error.TestFail('Cerberus test suite failed.')