Fix up kernbench to preserve tree in tests/kernbench/src and restore job
When we pickle kernel, we lose job. restore it from test.job afterwards
Signed-off-by: Martin J. Bligh <mbligh@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@424 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/client/tests/kernbench/kernbench.py b/client/tests/kernbench/kernbench.py
index 51f9c7c..55f7a8f 100755
--- a/client/tests/kernbench/kernbench.py
+++ b/client/tests/kernbench/kernbench.py
@@ -10,7 +10,7 @@
tarball = self.bindir + '/linux-2.6.14.tar.bz2'
else:
tarball = '/usr/local/src/linux-2.6.14.tar.bz2'
- kernel = self.job.kernel(tarball, self.tmpdir)
+ kernel = self.job.kernel(tarball, self.tmpdir, self.srcdir)
kernel.config(defconfig=True)
# have to save this off, as we might use it in another run
kernel.pickle_dump(self.srcdir + '/.pickle')
@@ -18,6 +18,7 @@
def execute(self, iterations = 1, threads = 2 * count_cpus()):
kernel = pickle.load(open(self.srcdir + '/.pickle', 'r'))
+ kernel.job = self.job
print "kernbench x %d: %d threads" % (iterations, threads)
kernel.build_timed(threads) # warmup run