Change kernbench to use defconfig
git-svn-id: http://test.kernel.org/svn/autotest/trunk@176 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/bin/kernel_config.py b/bin/kernel_config.py
index 8281c04..a595913 100755
--- a/bin/kernel_config.py
+++ b/bin/kernel_config.py
@@ -59,10 +59,15 @@
# 1. Get original config file
self.build_config = build_dir + '/.config'
- self.orig_config = config_dir + '/config.orig'
- get_file(orig_file, self.orig_config)
- self.update_config(self.orig_config, self.orig_config+'.new')
- diff_configs(self.orig_config, self.orig_config+'.new')
+ if (orig_file == ''): # use defconfig
+ os.chdir(build_dir)
+ system('make defconfig')
+ else:
+ self.orig_config = config_dir + '/config.orig'
+ get_file(orig_file, self.orig_config)
+ self.update_config(self.orig_config, self.orig_config+'.new')
+ diff_configs(self.orig_config, self.orig_config+'.new')
+
# 2. Apply overrides
if overrides:
diff --git a/tests/kernbench/kernbench.py b/tests/kernbench/kernbench.py
index 6d16fcd..fc74b64 100755
--- a/tests/kernbench/kernbench.py
+++ b/tests/kernbench/kernbench.py
@@ -7,9 +7,8 @@
def setup(self):
# http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.14.tar.bz2
tarball = self.bindir + '/linux-2.6.14.tar.bz2'
- config = self.bindir + "/config"
kernel = self.job.kernel(self.srcdir, tarball)
- kernel.config(config)
+ kernel.config('')
# have to save this off, as we might use it in another run
kernel.pickle_dump(self.srcdir + '/.pickle')