Looks good to me. -- John
On Wed, May 12, 2010 at 12:23 AM, Jason Wang <[email protected]> wrote: > Current version comparsion in check_glibc() and check_kernel_ver() may > think 2.11 is older than 2.5, so use the utils.compare_versions() to > solve it. > > Signed-off-by: Jason Wang <[email protected]> > --- > client/bin/base_utils.py | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/client/bin/base_utils.py b/client/bin/base_utils.py > index a3e989c..d44b970 100644 > --- a/client/bin/base_utils.py > +++ b/client/bin/base_utils.py > @@ -524,14 +524,14 @@ def cpu_online_map(): > def check_glibc_ver(ver): > glibc_ver = commands.getoutput('ldd --version').splitlines()[0] > glibc_ver = re.search(r'(\d+\.\d+(\.\d+)?)', glibc_ver).group() > - if glibc_ver.split('.') < ver.split('.'): > + if utils.compare_versions(glibc_ver, ver) == 1: > raise error.TestError("Glibc too old (%s). Glibc >= %s is needed." > % \ > (glibc_ver, ver)) > > def check_kernel_ver(ver): > kernel_ver = utils.system_output('uname -r') > kv_tmp = re.split(r'[-]', kernel_ver)[0:3] > - if kv_tmp[0].split('.') < ver.split('.'): > + if utils.compare_versions(kv_tmp[0], ver) == 1: > raise error.TestError("Kernel too old (%s). Kernel > %s is needed." > % \ > (kernel_ver, ver)) > > >
_______________________________________________ Autotest mailing list [email protected] http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
