Clean up white-space in files touched by xen build/install.
Signed-off-by: Ryan Harper <ryanh@us.ibm.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@428 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/client/bin/boottool.py b/client/bin/boottool.py
index 7f153b2..d79f8f0 100644
--- a/client/bin/boottool.py
+++ b/client/bin/boottool.py
@@ -9,36 +9,46 @@
autodir = os.environ['AUTODIR']
self.boottool_exec = autodir + '/tools/boottool'
+
def run_boottool(self, params):
return system_output('%s %s' % (self.boottool_exec, params))
+
def bootloader(self):
return self.run_boottool('--bootloader-probe')
+
def architecture(self):
return self.run_boottool('--arch-probe')
+
def list_titles(self):
print self.run_boottool('--info all | grep title')
+
def print_entry(self, index):
print self.run_boottool('--info=%s' % index)
+
def get_default(self):
self.run_boottool('--default')
+
def set_default(self, index):
self.run_boottool('--set-default=%s' % index)
+
# 'kernel' can be an position number or a title
def add_args(self, kernel, args):
self.run_boottool('--update-kernel=%s --args=%s' % \
(kernel, args) )
+
def remove_args(self, kernel, args):
self.run_boottool('--update-kernel=%s --remove-args=%s' % \
(kernel, args) )
+
def add_kernel(self, path, title='autotest', initrd=''):
# boot tool needs a dummy argument for add_args to work
# parameters = '--add-kernel=%s --title=%s --args=dummy' % \
@@ -54,9 +64,11 @@
def remove_kernel(self, kernel):
self.run_boottool('--remove-kernel=%s' % kernel)
+
def boot_once(self, title):
self.run_boottool('--boot-once --title=%s' % title)
+
def info(self, index):
return self.run_boottool('--info=%s' % index)
diff --git a/client/bin/job.py b/client/bin/job.py
index 7e458f6..5684354 100755
--- a/client/bin/job.py
+++ b/client/bin/job.py
@@ -17,12 +17,12 @@
"""The actual job against which we do everything.
Properties:
- autodir
+ autodir
The top level autotest directory (/usr/local/autotest).
Comes from os.environ['AUTODIR'].
- bindir
+ bindir
<autodir>/bin/
- testdir
+ testdir
<autodir>/tests/
profdir
<autodir>/profilers/
@@ -92,7 +92,7 @@
except:
pass
- pwd = os.getcwd()
+ pwd = os.getcwd()
os.chdir(self.resultdir + "/sysinfo")
system(self.bindir + '/sysinfo.py')
os.chdir(pwd)
@@ -135,7 +135,7 @@
i += 1
if not os.path.exists(results_dir):
os.mkdir(results_dir)
-
+
return kernel.kernel(self, base_tree, results_dir, tmp_dir, leave)
@@ -155,17 +155,17 @@
system('./' + dep + '.py')
except:
error = "setting up dependency " + dep + "\n"
- raise UnhandledError(error)
+ raise UnhandledError(error)
- def __runtest(self, url, tag, args, dargs):
- try:
+ def __runtest(self, url, tag, args, dargs):
+ try:
test.runtest(self, url, tag, args, dargs)
- except AutotestError:
- raise
- except:
- raise UnhandledError('running test ' + \
- self.__class__.__name__ + "\n")
+ except AutotestError:
+ raise
+ except:
+ raise UnhandledError('running test ' + \
+ self.__class__.__name__ + "\n")
def runtest(self, tag, url, *args):
@@ -323,7 +323,7 @@
def runjob(control, cont = False, tag = "default", harness_type = ''):
"""The main interface to this module
- control
+ control
The control file to use for this job.
cont
Whether this is the continuation of a previously started job
diff --git a/client/bin/kernel.py b/client/bin/kernel.py
index 2629bf3..a06c898 100755
--- a/client/bin/kernel.py
+++ b/client/bin/kernel.py
@@ -42,7 +42,7 @@
results_dir
Results directory (holds config/, debug/, results/)
tmp_dir
-
+
leave
Boolean, whether to leave existing tmpdir or not
"""
@@ -71,7 +71,7 @@
logpath = os.path.join(self.log_dir, 'build_log')
self.logfile = open(logpath, 'w+')
- self.target_arch = None
+ self.target_arch = None
self.build_target = 'bzImage'
if leave:
@@ -84,7 +84,7 @@
args = self.job.config_get('mirror.ftp_kernel_org')
if args:
args = '-l ' + args
- base_components = kernelexpand(base_tree, args)
+ base_components = kernelexpand(base_tree, args)
print 'kernelexpand: '
print base_components
self.get_kernel_tree(base_components.pop(0))
@@ -126,7 +126,7 @@
local_patches.append(dest)
return local_patches
-
+
def apply_patches(self, local_patches):
"""apply the list of patches, in order"""
builddir = self.build_dir
@@ -137,9 +137,9 @@
for patch in local_patches:
print 'Patching from', basename(patch), '...'
cat_file_to_cmd(patch, 'patch -p1 > /dev/null')
-
-
- def get_kernel_tree(self, base_tree):
+
+
+ def get_kernel_tree(self, base_tree):
"""Extract/link base_tree to self.build_dir"""
# if base_tree is a dir, assume uncompressed kernel
@@ -169,7 +169,7 @@
def build(self, make_opts = '', logfile = '', extraversion='autotest'):
"""build the kernel
-
+
make_opts
additional options to make, if any
"""
@@ -198,7 +198,7 @@
self.job.stdout.restore()
self.job.stderr.restore()
-
+
kernel_version = self.get_kernel_build_ver()
kernel_version = re.sub('-autotest', '', kernel_version)
self.logfile.write('BUILD VERSION: %s\n' % kernel_version)
@@ -244,7 +244,7 @@
if os.path.isfile(initrd):
print "Existing %s file, will remove it." % initrd
os.remove(initrd)
-
+
if vendor in ['Red Hat', 'Fedora Core']:
system('mkinitrd %s %s' % (initrd, version))
elif vendor in ['SUSE']:
@@ -256,7 +256,7 @@
def install(self, tag='autotest', prefix = '/'):
"""make install in the kernel tree"""
os.chdir(self.build_dir)
-
+
if not os.path.isdir(prefix):
os.mkdir(prefix)
self.boot_dir = os.path.join(prefix, 'boot')
@@ -379,7 +379,7 @@
if line.startswith('CONFIG_LOCALVERSION='):
localversion = line.rstrip().split('"')[1]
- return "%s.%s.%s%s%s" %(version, patchlevel, sublevel, extraversion, localversion)
+ return "%s.%s.%s%s%s" %(version, patchlevel, sublevel, extraversion, localversion)
def set_cross_cc(self, target_arch=None, cross_compile=None,
@@ -394,7 +394,7 @@
return
self.build_target = build_target
-
+
# If no 'target_arch' given assume native compilation
if target_arch == None:
target_arch = get_current_kernel_arch()
@@ -418,7 +418,7 @@
# compiler DOES build for.
# Oh, and BTW, install_package() doesn't exist yet.
-
+
if target_arch == 'ppc64':
install_package('ppc64-cross')
cross_compile = os.path.join(self.autodir, 'sources/ppc64-cross/bin')
@@ -433,7 +433,7 @@
if self.cross_compile:
os.environ['CROSS_COMPILE'] = self.cross_compile
-
+
def pickle_dump(self, filename):
"""dump a pickle of ourself out to the specified filename