public inbox for ltp@lists.linux.it
 help / color / mirror / Atom feed
* [LTP] [PATCH v3 1/7] lib/tst_kvercmp: Remove old distnames
@ 2022-12-16  5:01 Yang Xu
  2022-12-16  5:01 ` [LTP] [PATCH v3 2/7] shell: Remove old kernel version check Yang Xu
                   ` (5 more replies)
  0 siblings, 6 replies; 18+ messages in thread
From: Yang Xu @ 2022-12-16  5:01 UTC (permalink / raw)
  To: ltp

The oldest supported test distributions kernel version is 3.10[1], so these old version
check is useless.

[1]https://github.com/linux-test-project/ltp/wiki/Supported-kernel,-libc,-toolchain-versions
Acked-by: Jan Stancek <jstancek@redhat.com>
Acked-by: Petr Vorel <pvorel@suse.cz>
Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
---
 lib/tst_kvercmp.c                                   | 12 ------------
 testcases/kernel/syscalls/inotify/inotify04.c       | 13 +++----------
 .../kernel/tracing/dynamic_debug/dynamic_debug01.sh |  3 +--
 3 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/lib/tst_kvercmp.c b/lib/tst_kvercmp.c
index dc0daa746..a01b4332b 100644
--- a/lib/tst_kvercmp.c
+++ b/lib/tst_kvercmp.c
@@ -134,18 +134,6 @@ const char *tst_kvcmp_distname(const char *kver)
 	char *ret = distname;
 	char *p = distname;
 
-	if (strstr(kver, ".el5uek"))
-		return "OL5UEK";
-
-	if (strstr(kver, ".el5"))
-		return "RHEL5";
-
-	if (strstr(kver, ".el6uek"))
-		return "OL6UEK";
-
-	if (strstr(kver, ".el6"))
-		return "RHEL6";
-
 	if (strstr(kver, ".el7"))
 		return "RHEL7";
 
diff --git a/testcases/kernel/syscalls/inotify/inotify04.c b/testcases/kernel/syscalls/inotify/inotify04.c
index fb9f5c293..c4fce399c 100644
--- a/testcases/kernel/syscalls/inotify/inotify04.c
+++ b/testcases/kernel/syscalls/inotify/inotify04.c
@@ -50,11 +50,6 @@ char event_buf[EVENT_BUF_LEN];
 
 int fd_notify, reap_wd_file, reap_wd_dir, wd_dir, wd_file;
 
-static struct tst_kern_exv kvers[] = {
-	{ "RHEL5", "2.6.18-132" },
-	{ NULL, NULL },
-};
-
 static void cleanup(void)
 {
 	if (reap_wd_dir && myinotify_rm_watch(fd_notify, wd_dir) == -1)
@@ -110,11 +105,9 @@ void verify_inotify(void)
 	 * This isn't well documented in inotify(7), but it's intuitive if you
 	 * understand how Unix works.
 	 */
-	if (tst_kvercmp2(2, 6, 25, kvers) >= 0) {
-		event_set[test_cnt].mask = IN_ATTRIB;
-		strcpy(event_set[test_cnt].name, "");
-		test_cnt++;
-	}
+	event_set[test_cnt].mask = IN_ATTRIB;
+	strcpy(event_set[test_cnt].name, "");
+	test_cnt++;
 
 	event_set[test_cnt].mask = IN_DELETE_SELF;
 	strcpy(event_set[test_cnt].name, TEST_FILE);
diff --git a/testcases/kernel/tracing/dynamic_debug/dynamic_debug01.sh b/testcases/kernel/tracing/dynamic_debug/dynamic_debug01.sh
index 4b159517b..ca6c840b1 100755
--- a/testcases/kernel/tracing/dynamic_debug/dynamic_debug01.sh
+++ b/testcases/kernel/tracing/dynamic_debug/dynamic_debug01.sh
@@ -59,8 +59,7 @@ setup()
 		tst_brk TBROK "Unable to find $DEBUGFS_CONTROL"
 	fi
 
-	# Both patches with changes were backported to RHEL6 kernel 2.6.32-547
-	if tst_kvcmp -ge '3.4 RHEL6:2.6.32-547' ; then
+	if tst_kvcmp -ge 3.4 ; then
 		NEW_INTERFACE=1
 		EMPTY_FLAG="=_"
 	fi
-- 
2.27.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

^ permalink raw reply related	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2023-01-03 17:53 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-16  5:01 [LTP] [PATCH v3 1/7] lib/tst_kvercmp: Remove old distnames Yang Xu
2022-12-16  5:01 ` [LTP] [PATCH v3 2/7] shell: Remove old kernel version check Yang Xu
2022-12-16  8:55   ` Petr Vorel
2022-12-16  5:01 ` [LTP] [PATCH v3 3/7] cgroup_regression_test.sh: Remove obselte test_6 Yang Xu
2022-12-16  9:02   ` Petr Vorel
2022-12-16  9:11     ` xuyang2018.jy
2022-12-16 10:36       ` Petr Vorel
2022-12-16  5:02 ` [LTP] [PATCH v3 4/7] doc/shell-test-api.txt Yang Xu
2022-12-16  9:49   ` Petr Vorel
2022-12-16  5:02 ` [LTP] [PATCH v3 5/7] Remove old kernel version check in C case when using tst_kvercmp Yang Xu
2022-12-16 10:03   ` Petr Vorel
2022-12-16  5:02 ` [LTP] [PATCH v3 6/7] Remove old kernel version check when using min_kver Yang Xu
2022-12-16 10:11   ` Petr Vorel
2022-12-16  5:02 ` [LTP] [PATCH v3 7/7] doc/c-test-api.txt Yang Xu
2022-12-16 10:12   ` Petr Vorel
2022-12-19  3:01     ` xuyang2018.jy
2022-12-19  7:38       ` Petr Vorel
2023-01-03 17:53       ` Petr Vorel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox