Merge remote branch 'cros/upstream' into tempbranch3

client/tests/ltp/ltp.py

 import os
 from autotest_lib.client.bin import utils, test
 from autotest_lib.client.common_lib import error
 
 class ltp(test.test):
     version = 6
 
     def _import_site_config(self):
         site_config_path = os.path.join(os.path.dirname(__file__),
                                         'site_config.py')
@@ skipping 22 matching lines @@
 
         utils.system('patch -p1 < ../ltp.patch')
 
         # comment the capability tests if we fail to load the capability module
         try:
             utils.system('modprobe capability')
         except error.CmdError, detail:
             utils.system('patch -p1 < ../ltp_capability.patch')
 
         utils.system('cp ../scan.c pan/')   # saves having lex installed
-        utils.system('make autotools')
+        utils.make('autotools')
         utils.configure('--prefix=%s' % ltpbin_dir)
-        utils.system('make -j %d all' % utils.count_cpus())
+        utils.make('-j %d all' % utils.count_cpus())
         utils.system('yes n | make SKIP_IDCHECK=1 install')
 
 
     # Note: to run a specific test, try '-f cmdfile -s test' in the
     # in the args (-f for test file and -s for the test case)
     # eg, job.run_test('ltp', '-f math -s float_bessel')
     def run_once(self, args = '', script = 'runltp', ignore_tests=[]):
 
         ignore_tests = ignore_tests + self.site_ignore_tests
 
         # In case the user wants to run another test script
         if script == 'runltp':
             logfile = os.path.join(self.resultsdir, 'ltp.log')
             outfile = os.path.join(self.resultsdir, 'ltp.out')
             failcmdfile = os.path.join(self.debugdir, 'failcmdfile')
             excludecmdfile = os.path.join(self.bindir, 'site_excluded')
             args2 = '-q -l %s -C %s -d %s -o %s -S %s' % (logfile, failcmdfile,
                                                           self.tmpdir, outfile,
                                                           excludecmdfile)
             args = args + ' ' + args2
 
         ltpbin_dir = os.path.join(self.srcdir, 'bin')
         cmd = os.path.join(ltpbin_dir, script) + ' ' + args
         result = utils.run(cmd, ignore_status=True)
 
         # look for if there is any failed test command.
         failed_cmd = open(failcmdfile).read()
         if failed_cmd:
             raise error.TestFail(failed_cmd)