utils.compare_versions returns -1 if v1 < v2. Correct the mistake that was making some tests such as libhugetlbfs fail with:
TestError: Kernel too old (2.6.31.5-127.fc12.x86_64). Kernel > 2.6.16 is needed. Signed-off-by: Lucas Meneghel Rodrigues <[email protected]> --- client/bin/base_utils.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/client/bin/base_utils.py b/client/bin/base_utils.py index d44b970..29797e6 100644 --- a/client/bin/base_utils.py +++ b/client/bin/base_utils.py @@ -531,9 +531,10 @@ def check_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 utils.compare_versions(kv_tmp[0], ver) == 1: - raise error.TestError("Kernel too old (%s). Kernel > %s is needed." % \ - (kernel_ver, ver)) + # In compare_versions, if v1 < v2, return value == -1 + if utils.compare_versions(kv_tmp[0], ver) == -1: + raise error.TestError("Kernel too old (%s). Kernel > %s is needed." % + (kernel_ver, ver)) def human_format(number): -- 1.7.0.1 _______________________________________________ Autotest mailing list [email protected] http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
