Add running_config() function to fetch path of running config
Modify cpu_hotplug test to use it.
git-svn-id: http://test.kernel.org/svn/autotest/trunk@248 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/bin/autotest_utils.py b/bin/autotest_utils.py
index 0d3c6a7..71f9f04 100755
--- a/bin/autotest_utils.py
+++ b/bin/autotest_utils.py
@@ -340,6 +340,17 @@
(elapsed/count, user/count, system/count, cpu/count)
+def running_config():
+ """
+ Return path of config file of the currently running kernel
+ """
+ for config in ('/proc/config.gz', \
+ '/boot/config-%s' % system_output('uname -r') ):
+ if os.path.isfile(config):
+ return config
+ return None
+
+
class fd_stack:
"""a stack of fd redirects
diff --git a/tests/cpu_hotplug/cpu_hotplug.py b/tests/cpu_hotplug/cpu_hotplug.py
index c00e79c..a73fa73 100644
--- a/tests/cpu_hotplug/cpu_hotplug.py
+++ b/tests/cpu_hotplug/cpu_hotplug.py
@@ -10,19 +10,10 @@
extract_tarball_to_dir(tarball, self.srcdir)
def execute(self):
- # Check if kernel support cpu hotplug
- if os.path.isfile('/proc/config.gz'):
- hotplug = system_output('zcat /proc/config.gz | grep CONFIG_HOTPLUG_CPU=y')
- if not len(hotplug):
- print 'Kernel does not support cpu hotplug, quiting...'
- sys.exit()
- else:
- kernel_version = system_output('uname -r')
- config = '/boot/config-%s' %kernel_version
- if os.path.isfile(config):
- if not file_contains_pattern(config, 'CONFIG_HOTPLUG_CPU=y'):
- print 'Kernel does not support cpu hotplug, quiting...'
- sys.exit()
+ # Check if the kernel supports cpu hotplug
+ config = running_config()
+ if config and not grep('CONFIG_HOTPLUG_CPU=y', config):
+ raise TestError('Kernel does not support cpu hotplug')
# Check cpu nums, if equals 1, quit.
if count_cpus() == 1:
@@ -58,5 +49,5 @@
cpus = []
for line in open('/proc/cpuinfo', 'r').readlines():
if line.startswith('processor'):
- cpus.append(line.split()[2])
+ cpus.append(line.split()[2]) # grab cpu number
return cpus
