kernbench: update to new test format
The internal structure of a test has changed. Make the kernbench
test and its test job match that new usage.
Signed-off-by: Andy Whitcroft <apw@shadowen.org>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@26 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/bin/tests/kernbench.py b/bin/tests/kernbench.py
index 867d622..62a2b5f 100755
--- a/bin/tests/kernbench.py
+++ b/bin/tests/kernbench.py
@@ -1,12 +1,11 @@
import test
from autotest_utils import *
-class kernbench(test):
-
- def setup(self,
+class kernbench(test.test):
+ def execute(self,
iterations = 1,
threads = 2 * count_cpus(),
- kernelver = '/usr/local/src/linux-2.6.14.tar.bz2',
+ kernelver = os.environ['HOME'] + '/linux-2.6.14.tar.bz2',
config = os.environ['AUTODIRBIN'] + "/tests/kernbench/config"):
print "kernbench -j %d -i %d -c %s -k %s" % (threads, iterations, config, kernelver)
@@ -16,15 +15,14 @@
self.kernelver = kernelver
self.config = config
- top_dir = job.tmpdir+'/kernbench'
- kernel = job.kernel(top_dir, kernelver)
+ top_dir = self.job.tmpdir+'/kernbench'
+ kernel = self.job.kernel(top_dir, kernelver)
kernel.config([config])
- def execute(self):
- testkernel.build_timed(threads) # warmup run
+ kernel.build_timed(threads) # warmup run
for i in range(1, iterations+1):
- testkernel.build_timed(threads, '../log/time.%d' % i)
+ kernel.build_timed(threads, '../log/time.%d' % i)
os.chdir(top_dir + '/log')
system("grep elapsed time.* > time")