TEST: Add kernel version checking support

Provide function to check for the kernel version to use in feature checks.

Signed-off-by: David Howells <dhowells@redhat.com>

4 files changed, 24 insertions, 2 deletions

diff --git a/tests/keyctl/permitting/valid/runtest.sh b/tests/keyctl/permitting/valid/runtest.sh
index 7c92180..70600e7 100644
--- a/tests/keyctl/permitting/valid/runtest.sh
+++ b/tests/keyctl/permitting/valid/runtest.sh
@@ -20,7 +20,7 @@ create_key user lizard gizzard $keyringid
 expect_keyid keyid
 
 # changing the key's ownership is not supported before 2.6.18-rc1
-if version_less_than `uname -r` 2.6.18
+if kernel_older_than 2.6.18
 then
     marker "CHOWN"
     chown_key --fail $keyid 1
diff --git a/tests/keyctl/search/valid/runtest.sh b/tests/keyctl/search/valid/runtest.sh
index 3709e49..fb51b21 100644
--- a/tests/keyctl/search/valid/runtest.sh
+++ b/tests/keyctl/search/valid/runtest.sh
@@ -167,7 +167,7 @@ case $kver in
 	expect_error EKEYREVOKED
 	;;
     *)
-	if version_less_than `uname -r` 3.13
+	if kernel_older_than 3.13
 	then
 	    expect_error ENOKEY
 	else
diff --git a/tests/prepare.inc.sh b/tests/prepare.inc.sh
index b46940e..8abcec2 100644
--- a/tests/prepare.inc.sh
+++ b/tests/prepare.inc.sh
@@ -47,3 +47,5 @@ fi
 KEYUTILSVER=`expr "$KEYUTILSVER" : '.*keyutils-\([0-9.]*\).*'`
 
 . $includes/version.inc.sh
+
+KERNELVER=`uname -r`
diff --git a/tests/version.inc.sh b/tests/version.inc.sh
index 7b0cb7b..4155296 100644
--- a/tests/version.inc.sh
+++ b/tests/version.inc.sh
@@ -140,3 +140,23 @@ function keyutils_at_or_older_than ()
 {
     ! keyutils_newer_than $1
 }
+
+###############################################################################
+#
+# Return true if the kernel being tested is older than the given version.
+#
+###############################################################################
+function kernel_older_than ()
+{
+    version_less_than $KERNELVER $1
+}
+
+###############################################################################
+#
+# Return true if the kernel being tested is at or later than the given version.
+#
+###############################################################################
+function kernel_at_or_later_than ()
+{
+    ! kernel_older_than $1
+}