lib: add tst_kvercmp2 to compare specific vendor extra kernel versions
We can now test specific verdor kernel versions in
test cases like:
static struct tst_kern_exv exv[] = {
{"RHEL6", "234"},
{"SLES10", "0.91"},
{NULL, NULL}
};
...
if (tst_kvercmp2(2, 6, 25, exv) < 0)
...
...
Thank you for Cyril's suggestion.
Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>
Acked-by: Cyril Hrubis <chrubis@suse.cz>
Reviewed-by: Caspar Zhang <caspar@casparzhang.com>
Reviewed-by: Jan Stancek <jstancek@redhat.com>
diff --git a/lib/tst_kvercmp.c b/lib/tst_kvercmp.c
index cb4fd67..15fb571 100644
--- a/lib/tst_kvercmp.c
+++ b/lib/tst_kvercmp.c
@@ -34,15 +34,13 @@
#include <unistd.h>
#include <string.h>
#include <sys/utsname.h>
+#include "test.h"
void get_kver(int *k1, int *k2, int *k3)
{
struct utsname uval;
char *kver;
char *r1, *r2, *r3;
-#if !defined(linux)
- extern char *strsep(); /* shut up some compilers */
-#endif
uname(&uval);
kver = uval.release;
@@ -66,3 +64,45 @@
return currver - testver;
}
+
+static int tst_kexvcmp(char *tst_exv, char *cur_ver)
+{
+ int c1 = 0, c2 = 0, t1 = 0, t2 = 0;
+ int ret;
+
+ sscanf(cur_ver, "%*d.%*d.%*d-%d.%d", &c1, &c2);
+ sscanf(tst_exv, "%d.%d", &t1, &t2);
+ if ((ret = c1 - t1))
+ return ret;
+ else
+ return c2 - t2;
+}
+
+int tst_kvercmp2(int r1, int r2, int r3, struct tst_kern_exv *vers)
+{
+ int ret;
+ int i;
+ struct utsname uval;
+ char *kver;
+ const char *cur_dist_name = NULL;
+
+ if ((ret = tst_kvercmp(r1, r2, r3)))
+ return ret;
+
+ uname(&uval);
+ kver = uval.release;
+ if (strstr(kver, ".el5")) {
+ cur_dist_name = "RHEL5";
+ } else if (strstr(kver, ".el6")) {
+ cur_dist_name = "RHEL6";
+ } else {
+ return ret;
+ }
+
+ for (i = 0; vers[i].dist_name; i++) {
+ if (!strcmp(vers[i].dist_name, cur_dist_name))
+ return tst_kexvcmp(vers[i].extra_ver, kver);
+ }
+
+ return ret;
+}