diff mbox series

[02/15] recv{, from, msg}01: Remove kernel >= 3.17 check

Message ID 20240527063346.289771-3-pvorel@suse.cz
State Accepted
Headers show
Series Remove kernel >= 3.x checks | expand

Commit Message

Petr Vorel May 27, 2024, 6:33 a.m. UTC
Since 9e9654cf2 LTP supports kernel >= 4.4.

Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
 testcases/kernel/syscalls/recv/recv01.c         | 8 --------
 testcases/kernel/syscalls/recvfrom/recvfrom01.c | 8 --------
 testcases/kernel/syscalls/recvmsg/recvmsg01.c   | 7 -------
 3 files changed, 23 deletions(-)

Comments

Wei Gao May 28, 2024, 7:57 a.m. UTC | #1
On Mon, May 27, 2024 at 08:33:33AM +0200, Petr Vorel wrote:
> Since 9e9654cf2 LTP supports kernel >= 4.4.
> 
> Signed-off-by: Petr Vorel <pvorel@suse.cz>
Reviewed-by: Wei Gao <wegao@suse.com>
> ---
>  testcases/kernel/syscalls/recv/recv01.c         | 8 --------
>  testcases/kernel/syscalls/recvfrom/recvfrom01.c | 8 --------
>  testcases/kernel/syscalls/recvmsg/recvmsg01.c   | 7 -------
>  3 files changed, 23 deletions(-)
> 
> diff --git a/testcases/kernel/syscalls/recv/recv01.c b/testcases/kernel/syscalls/recv/recv01.c
> index d71243c30..bb2578355 100644
> --- a/testcases/kernel/syscalls/recv/recv01.c
> +++ b/testcases/kernel/syscalls/recv/recv01.c
> @@ -113,14 +113,6 @@ int main(int argc, char *argv[])
>  	for (lc = 0; TEST_LOOPING(lc); ++lc) {
>  		tst_count = 0;
>  		for (testno = 0; testno < TST_TOTAL; ++testno) {
> -			if ((tst_kvercmp(3, 17, 0) < 0)
> -			    && (tdat[testno].flags & MSG_ERRQUEUE)
> -			    && (tdat[testno].type & SOCK_STREAM)) {
> -				tst_resm(TCONF, "skip MSG_ERRQUEUE test, "
> -						"it's supported from 3.17");
> -				continue;
> -			}
> -
>  			tdat[testno].setup();
>  			TEST(recv(s, tdat[testno].buf, tdat[testno].buflen,
>  				  tdat[testno].flags));
> diff --git a/testcases/kernel/syscalls/recvfrom/recvfrom01.c b/testcases/kernel/syscalls/recvfrom/recvfrom01.c
> index f26f85688..6ce9f1bde 100644
> --- a/testcases/kernel/syscalls/recvfrom/recvfrom01.c
> +++ b/testcases/kernel/syscalls/recvfrom/recvfrom01.c
> @@ -137,14 +137,6 @@ int main(int argc, char *argv[])
>  	for (lc = 0; TEST_LOOPING(lc); ++lc) {
>  		tst_count = 0;
>  		for (testno = 0; testno < TST_TOTAL; ++testno) {
> -			if ((tst_kvercmp(3, 17, 0) < 0)
> -			    && (tdat[testno].flags & MSG_ERRQUEUE)
> -			    && (tdat[testno].type & SOCK_STREAM)) {
> -				tst_resm(TCONF, "skip MSG_ERRQUEUE test, "
> -						"it's supported from 3.17");
> -				continue;
> -			}
> -
>  			tdat[testno].setup();
>  			TEST(recvfrom(s, tdat[testno].buf, tdat[testno].buflen,
>  				      tdat[testno].flags, tdat[testno].from,
> diff --git a/testcases/kernel/syscalls/recvmsg/recvmsg01.c b/testcases/kernel/syscalls/recvmsg/recvmsg01.c
> index 80c1b3aa9..a265bc3bd 100644
> --- a/testcases/kernel/syscalls/recvmsg/recvmsg01.c
> +++ b/testcases/kernel/syscalls/recvmsg/recvmsg01.c
> @@ -220,13 +220,6 @@ static void run(unsigned int n)
>  	struct tcase *tc = &tcases[n];
>  	int ret = tc->exp_errno ? -1 : 0;
>  
> -	if ((tst_kvercmp(3, 17, 0) < 0)
> -			&& (tc->flags & MSG_ERRQUEUE)
> -			&& (tc->type & SOCK_STREAM)) {
> -		tst_res(TCONF, "MSG_ERRQUEUE requires kernel >= 3.17");
> -		return;
> -	}
> -
>  	setup_all();
>  	tc->setup(n);
>  
> -- 
> 2.43.0
> 
> 
> -- 
> Mailing list info: https://lists.linux.it/listinfo/ltp
diff mbox series

Patch

diff --git a/testcases/kernel/syscalls/recv/recv01.c b/testcases/kernel/syscalls/recv/recv01.c
index d71243c30..bb2578355 100644
--- a/testcases/kernel/syscalls/recv/recv01.c
+++ b/testcases/kernel/syscalls/recv/recv01.c
@@ -113,14 +113,6 @@  int main(int argc, char *argv[])
 	for (lc = 0; TEST_LOOPING(lc); ++lc) {
 		tst_count = 0;
 		for (testno = 0; testno < TST_TOTAL; ++testno) {
-			if ((tst_kvercmp(3, 17, 0) < 0)
-			    && (tdat[testno].flags & MSG_ERRQUEUE)
-			    && (tdat[testno].type & SOCK_STREAM)) {
-				tst_resm(TCONF, "skip MSG_ERRQUEUE test, "
-						"it's supported from 3.17");
-				continue;
-			}
-
 			tdat[testno].setup();
 			TEST(recv(s, tdat[testno].buf, tdat[testno].buflen,
 				  tdat[testno].flags));
diff --git a/testcases/kernel/syscalls/recvfrom/recvfrom01.c b/testcases/kernel/syscalls/recvfrom/recvfrom01.c
index f26f85688..6ce9f1bde 100644
--- a/testcases/kernel/syscalls/recvfrom/recvfrom01.c
+++ b/testcases/kernel/syscalls/recvfrom/recvfrom01.c
@@ -137,14 +137,6 @@  int main(int argc, char *argv[])
 	for (lc = 0; TEST_LOOPING(lc); ++lc) {
 		tst_count = 0;
 		for (testno = 0; testno < TST_TOTAL; ++testno) {
-			if ((tst_kvercmp(3, 17, 0) < 0)
-			    && (tdat[testno].flags & MSG_ERRQUEUE)
-			    && (tdat[testno].type & SOCK_STREAM)) {
-				tst_resm(TCONF, "skip MSG_ERRQUEUE test, "
-						"it's supported from 3.17");
-				continue;
-			}
-
 			tdat[testno].setup();
 			TEST(recvfrom(s, tdat[testno].buf, tdat[testno].buflen,
 				      tdat[testno].flags, tdat[testno].from,
diff --git a/testcases/kernel/syscalls/recvmsg/recvmsg01.c b/testcases/kernel/syscalls/recvmsg/recvmsg01.c
index 80c1b3aa9..a265bc3bd 100644
--- a/testcases/kernel/syscalls/recvmsg/recvmsg01.c
+++ b/testcases/kernel/syscalls/recvmsg/recvmsg01.c
@@ -220,13 +220,6 @@  static void run(unsigned int n)
 	struct tcase *tc = &tcases[n];
 	int ret = tc->exp_errno ? -1 : 0;
 
-	if ((tst_kvercmp(3, 17, 0) < 0)
-			&& (tc->flags & MSG_ERRQUEUE)
-			&& (tc->type & SOCK_STREAM)) {
-		tst_res(TCONF, "MSG_ERRQUEUE requires kernel >= 3.17");
-		return;
-	}
-
 	setup_all();
 	tc->setup(n);