Various bugfixen
git-svn-id: http://test.kernel.org/svn/autotest/trunk@82 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/tests/kernbench/kernbench.py b/tests/kernbench/kernbench.py
index 5b1359a..519adaf 100755
--- a/tests/kernbench/kernbench.py
+++ b/tests/kernbench/kernbench.py
@@ -2,24 +2,17 @@
from autotest_utils import *
class kernbench(test.test):
- def execute(self,
- iterations = 1,
- threads = 2 * count_cpus(),
- kernelver = '/usr/local/src//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)
+ def setup(self, kernelver = '/usr/local/src/linux-2.6.14.tar.bz2',
+ config = os.environ['AUTODIR'] + "/tests/kernbench/config"):
- self.iterations = iterations
- self.threads = threads
- self.kernelver = kernelver
- self.config = config
-
- top_dir = self.job.tmpdir+'/kernbench'
- kernel = self.job.kernel(top_dir, kernelver)
+ self.top_dir = self.job.tmpdir+'/kernbench'
+ kernel = self.job.kernel(self.top_dir, kernelver)
kernel.config(config)
+ def execute(self, iterations = 1, threads = 2 * count_cpus()):
+ print "kernbench x %d: %d threads" % (iterations, threads)
+
kernel.build_timed(threads) # warmup run
for i in range(1, iterations+1):
kernel.build_timed(threads, '../log/time.%d' % i)