Risk: Required
Visibility: Minimal
Second pass on clean up.
I tested all test to make sure they at least run correctly, adding a few control
file stubs here and there.
Most of the fixes are import os fixes along with a few incorrect references
Signed-off-by: Scott Zawalski <scottz@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@1607 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/client/tests/sysbench/sysbench.py b/client/tests/sysbench/sysbench.py
index 7a19745..58b7d25 100644
--- a/client/tests/sysbench/sysbench.py
+++ b/client/tests/sysbench/sysbench.py
@@ -8,7 +8,7 @@
# http://osdn.dl.sourceforge.net/sourceforge/sysbench/sysbench-0.4.8.tar.gz
def setup(self, tarball = 'sysbench-0.4.8.tar.bz2'):
- tarball = autotest_utils.unmap_url(self.bindir, tarball,
+ tarball = utils.unmap_url(self.bindir, tarball,
self.tmpdir)
autotest_utils.extract_tarball_to_dir(tarball, self.srcdir)
self.job.setup_dep(['pgsql', 'mysql'])
@@ -20,11 +20,11 @@
# configure wants to get at pg_config, so add its path
utils.system('PATH=%s/bin:$PATH ./configure --with-mysql=%s --with-pgsql' % (pgsql_dir, mysql_dir))
- utils.system('make -j %d' % count_cpus())
+ utils.system('make -j %d' % autotest_utils.count_cpus())
def execute(self, db_type = 'pgsql', build = 1, \
- num_threads = count_cpus(), max_time = 60, \
+ num_threads = autotest_utils.count_cpus(), max_time = 60, \
read_only = 0, args = ''):
plib = os.path.join(self.autodir, 'deps/pgsql/pgsql/lib')
mlib = os.path.join(self.autodir, 'deps/mysql/mysql/lib/mysql')