[LTP] [PATCH v2 5/6] syscalls/modify_ldt03: Merge into modify_ldt01

[rbm@suse.com]

From: Ricardo B. Marlière <rbm@suse.com>

Signed-off-by: Ricardo B. Marlière <rbm@suse.com>
---
 testcases/kernel/syscalls/modify_ldt/.gitignore    |  5 ++--
 .../kernel/syscalls/modify_ldt/modify_ldt01.c      | 20 ++++++++-----
 .../kernel/syscalls/modify_ldt/modify_ldt03.c      | 35 ----------------------
 3 files changed, 14 insertions(+), 46 deletions(-)

diff --git a/testcases/kernel/syscalls/modify_ldt/.gitignore b/testcases/kernel/syscalls/modify_ldt/.gitignore
index c0b8bbf5875af453b4880ef4b717fdb40d109ee7..c8817b2c3a811afdf40841dc1b81e4b2c034e7d8 100644
--- a/testcases/kernel/syscalls/modify_ldt/.gitignore
+++ b/testcases/kernel/syscalls/modify_ldt/.gitignore
@@ -1,3 +1,2 @@
-/modify_ldt01
-/modify_ldt02
-/modify_ldt03
+modify_ldt01
+modify_ldt02
diff --git a/testcases/kernel/syscalls/modify_ldt/modify_ldt01.c b/testcases/kernel/syscalls/modify_ldt/modify_ldt01.c
index d93a2815f980c17e9490d0285c63d76c69e88d02..215ef48d9c3ef095b5035b98bac009b61bdd6d6e 100644
--- a/testcases/kernel/syscalls/modify_ldt/modify_ldt01.c
+++ b/testcases/kernel/syscalls/modify_ldt/modify_ldt01.c
@@ -6,10 +6,11 @@
  */
 
 /*\
- * Verify that modify_ldt() call fails with errno:
+ * Verify that modify_ldt() calls:
  *
- * - EINVAL, when writing (func=1) to an invalid pointer
- * - EFAULT, when reading (func=0) from an invalid pointer
+ * - Fails with EINVAL, when writing (func=1) to an invalid pointer
+ * - Fails with EFAULT, when reading (func=0) from an invalid pointer
+ * - Passes when reading (func=0) from a valid pointer
  */
 
 #include "tst_test.h"
@@ -26,17 +27,20 @@ static struct tst_case {
 	unsigned long bytecount;
 	int exp_errno;
 } tst_cases[] = {
-	/* { 100, &buf, sizeof(buf), ENOSYS },  // 01 block1 */
-	{ 1, (void *)0, 0, EINVAL }, // 01 block2
-	{ 0, &ptr, sizeof(ptr), EFAULT }, // 01 block3
+	{ 1, (void *)0, 0, EINVAL },
+	{ 0, &ptr, sizeof(ptr), EFAULT },
+	{ 0, &buf, sizeof(buf), 0 },
 };
 
 void run(unsigned int i)
 {
 	struct tst_case *tc = &tst_cases[i];
 
-	TST_EXP_FAIL(modify_ldt(tc->tfunc, tc->ptr, tc->bytecount),
-		     tc->exp_errno);
+	if (tc->exp_errno)
+		TST_EXP_FAIL(modify_ldt(tc->tfunc, tc->ptr, tc->bytecount),
+			     tc->exp_errno);
+	else
+		TST_EXP_POSITIVE(modify_ldt(tc->tfunc, tc->ptr, tc->bytecount));
 }
 
 void setup(void)
diff --git a/testcases/kernel/syscalls/modify_ldt/modify_ldt03.c b/testcases/kernel/syscalls/modify_ldt/modify_ldt03.c
deleted file mode 100644
index addc7d0e0c2eaec4564b9a20be05e8f0638bd175..0000000000000000000000000000000000000000
--- a/testcases/kernel/syscalls/modify_ldt/modify_ldt03.c
+++ /dev/null
@@ -1,35 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-/*
- * Copyright (c) 2014 Fujitsu Ltd. Zeng Linggang <zenglg.jy@cn.fujitsu.com>
- * Copyright (c) 2025 SUSE LLC Ricardo B. Marlière <rbm@suse.com>
- */
-
-/*\
- * Verify that a simple read (func=0) works when calling modify_ldt.
- */
-
-#include "tst_test.h"
-
-#ifdef __i386__
-#include "lapi/ldt.h"
-
-static char *buf;
-
-void run(void)
-{
-	TST_EXP_POSITIVE(modify_ldt(0, buf, sizeof(buf)));
-}
-
-static struct tst_test test = {
-	.test_all = run,
-	.bufs =
-		(struct tst_buffers[]){
-			{ &buf, .size = sizeof(struct user_desc) },
-			{},
-		},
-};
-
-#else
-TST_TEST_TCONF("Test supported only on i386");
-#endif /* __i386__ */

-- 
2.49.0