public inbox for ltp@lists.linux.it
 help / color / mirror / Atom feed
* [LTP] [PATCH 1/1] io_destroy01: TCONF when unsupported
@ 2020-09-29  7:35 Petr Vorel
  2020-09-29  7:41 ` Yang Xu
  2020-09-29  8:38 ` Cyril Hrubis
  0 siblings, 2 replies; 11+ messages in thread
From: Petr Vorel @ 2020-09-29  7:35 UTC (permalink / raw)
  To: ltp

to fix test on kernel built without CONFIG_AIO=y.

Cleanup: use return instead of else, join string.

Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
Hi,

simple patch, but can wait after release.
I can move cleanup into separate commit.

Kind regards,
Petr

 testcases/kernel/syscalls/io_destroy/io_destroy01.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/testcases/kernel/syscalls/io_destroy/io_destroy01.c b/testcases/kernel/syscalls/io_destroy/io_destroy01.c
index 560d7b3fb..5c5c59335 100644
--- a/testcases/kernel/syscalls/io_destroy/io_destroy01.c
+++ b/testcases/kernel/syscalls/io_destroy/io_destroy01.c
@@ -32,14 +32,19 @@ static void verify_io_destroy(void)
 		return;
 	}
 
+	if (TST_RET == -ENOSYS) {
+		tst_res(TCONF, "io_destroy() not supported");
+		return;
+	}
+
 	if (TST_RET == -EINVAL) {
 		tst_res(TPASS,
 			"io_destroy() failed as expected, returned -EINVAL");
-	} else {
-		tst_res(TFAIL, "io_destroy() failed unexpectedly, "
-			"returned -%s expected -EINVAL",
-			tst_strerrno(-TST_RET));
+		return;
 	}
+
+	tst_res(TFAIL, "io_destroy() failed unexpectedly, returned -%s expected -EINVAL",
+		tst_strerrno(-TST_RET));
 }
 
 static struct tst_test test = {
-- 
2.28.0


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

end of thread, other threads:[~2020-09-30  9:10 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-29  7:35 [LTP] [PATCH 1/1] io_destroy01: TCONF when unsupported Petr Vorel
2020-09-29  7:41 ` Yang Xu
2020-09-29  8:41   ` Petr Vorel
2020-09-29  9:57     ` Yang Xu
2020-09-29 11:47       ` Richard Palethorpe
2020-09-30  9:10         ` Petr Vorel
2020-09-29 13:02   ` Cyril Hrubis
2020-09-29  8:38 ` Cyril Hrubis
2020-09-29  8:48   ` Petr Vorel
2020-09-29  8:51     ` Cyril Hrubis
2020-09-29  9:41       ` Petr Vorel

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