Merge remote branch 'cros/upstream' into tempbranch3

client/tests/dbt2/dbt2.py

 import os
 from autotest_lib.client.bin import test, utils
 
 
 # Dbt-2 is a fair-use implementation of the TPC-C benchmark.  The test is
 # currently hardcoded to use PostgreSQL but the kit also supports MySQL.
 
 class dbt2(test.test):
     version = 2
 
     def initialize(self):
         self.job.require_gcc()
 
 
     # http://osdn.dl.sourceforge.net/sourceforge/osdldbt/dbt2-0.39.tar.gz
     def setup(self, tarball = 'dbt2-0.39.tar.bz2'):
         tarball = utils.unmap_url(self.bindir, tarball, self.tmpdir)
         utils.extract_tarball_to_dir(tarball, self.srcdir)
         self.job.setup_dep(['pgsql', 'pgpool', 'mysql'])
 
         #
         # Extract one copy of the kit for MySQL.
         #
         utils.system('cp -pR ' + self.srcdir + ' ' + self.srcdir + '.mysql')
         os.chdir(self.srcdir + '.mysql')
-        utils.system('./configure --with-mysql=%s/deps/mysql/mysql' \
-                        % self.autodir)
-        utils.system('make')
+        utils.configure('--with-mysql=%s/deps/mysql/mysql' % self.autodir)
+        utils.make()
 
         #
         # Extract one copy of the kit for PostgreSQL.
         #
         utils.system('cp -pR ' + self.srcdir + ' ' + self.srcdir + '.pgsql')
         os.chdir(self.srcdir + '.pgsql')
-        utils.system('./configure --with-postgresql=%s/deps/pgsql/pgsql' \
-                        % self.autodir)
-        utils.system('make')
+        utils.configure('--with-postgresql=%s/deps/pgsql/pgsql' % self.autodir)
+        utils.make()
 
         # Create symlinks to autotest's results directory from dbt-2's
         # preferred results directory to self.resultsdir
         utils.system('ln -s %s %s' %
                      (self.resultsdir, self.srcdir + '.mysql/scripts/output'))
         utils.system('ln -s %s %s' %
                      (self.resultsdir, self.srcdir + '.pgsql/scripts/output'))
 
 
     def execute(self, db_type, args = ''):
@@ skipping 22 matching lines @@
 
     def execute_pgsql(self, args = ''):
         utils.system(self.srcdir + '.pgsql/scripts/pgsql/build_db.sh -g -w 1')
         utils.system(self.srcdir + '.pgsql/scripts/run_workload.sh ' + args)
         #
         # Clean up by dropping the database after the test.
         #
         utils.system(self.srcdir + '.pgsql/scripts/pgsql/start_db.sh')
         utils.system(self.srcdir + '.pgsql/scripts/pgsql/drop_db.sh')
         utils.system(self.srcdir + '.pgsql/scripts/pgsql/stop_db.sh')