[LTP] [PATCH v4] mem: Convert shmt02 to new API

[Ricardo B. Marlière]

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

Reviewed-by: Andrea Cervesato <andrea.cervesato@suse.com>
Signed-off-by: Ricardo B. Marlière <rbm@suse.com>
---
Changes in v4:
- Drop unneeded `errno` and `register`
- Link to v3: https://lore.kernel.org/r/20250623-conversions-shmt-v3-1-1c910c98e206@suse.com

Changes in v3:
- Use GETIPCKEY()
- Link to v2: https://lore.kernel.org/r/20250620-conversions-shmt-v2-1-56cae20e184f@suse.com

Changes in v2:
- Use tst_rand_data and TST_EXP_EQ_STRN()
- Link to v1: https://lore.kernel.org/r/20250618-conversions-shmt-v1-1-5b935f7859ad@suse.com
---
 testcases/kernel/mem/shmt/Makefile |   5 ++
 testcases/kernel/mem/shmt/shmt02.c | 124 +++++++------------------------------
 2 files changed, 28 insertions(+), 101 deletions(-)

diff --git a/testcases/kernel/mem/shmt/Makefile b/testcases/kernel/mem/shmt/Makefile
index ee37fd9abf4ce8d343454b4640a3c654e648686f..a54bcfe190c192d81b1eeee47b9ec6a5fab24427 100644
--- a/testcases/kernel/mem/shmt/Makefile
+++ b/testcases/kernel/mem/shmt/Makefile
@@ -22,5 +22,10 @@
 
 top_srcdir              ?= ../../../..
 
+LTPLIBS = newipc
+
 include $(top_srcdir)/include/mk/testcases.mk
+
+shmt02: LTPLDLIBS  = -lltpnewipc
+
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/mem/shmt/shmt02.c b/testcases/kernel/mem/shmt/shmt02.c
index b33a042f93625cf44af1c3de6354248919f21522..020074d3ebcbef999ae96790b51b763a577902e5 100644
--- a/testcases/kernel/mem/shmt/shmt02.c
+++ b/testcases/kernel/mem/shmt/shmt02.c
@@ -1,120 +1,42 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
- *
- *   Copyright (c) International Business Machines  Corp., 2002
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Copyright (c) International Business Machines  Corp., 2002
+ *	12/20/2002	Port to LTP	robbiew@us.ibm.com
+ *	06/30/2001	Port to Linux	nsharoff@us.ibm.com
+ * Copyright (c) 2025 SUSE LLC Ricardo B. Marlière <rbm@suse.com>
  */
 
-/* 12/20/2002		 Port to LTP		 robbiew@us.ibm.com */
-/* 06/30/2001		 Port to Linux		 nsharoff@us.ibm.com */
-
-/*
- * NAME
- *		 shmt02
- *
- * CALLS
- *		 shmctl(2) shmget(2)
- *
- * ALGORITHM
+/*\
  * Create and attach a shared memory segment, write to it
- * and then remove it.		  Verify that the shared memory segment
+ * and then remove it. Verify that the shared memory segment
  * is accessible as long as the process is still alive.
- *
  */
 
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <sys/utsname.h>
-#include <errno.h>
-
-/** LTP Port **/
-#include "test.h"
-
-char *TCID = "shmt02";		/* Test program identifier.    */
-int TST_TOTAL = 3;		/* Total number of test cases. */
-
-/**************/
+#include "tst_test.h"
+#include "tst_safe_sysv_ipc.h"
+#include "tst_rand_data.h"
+#include "libnewipc.h"
 
-#define K_1 1024
+#define SHMSIZE 16
 
-static int rm_shm(int);
-
-int main(void)
+static void run(void)
 {
-	register int shmid;
 	char *cp;
+	int shmid;
 	key_t key;
 
-	errno = 0;
-	key = (key_t) getpid();
-
-/*----------------------------------------------------------------*/
-
-	if ((shmid = shmget(key, 16 * K_1, IPC_CREAT | 0666)) < 0) {
-		perror("shmget");
-		tst_brkm(TFAIL, NULL,
-			 "shmget Failed: shmid = %d, errno = %d",
-			 shmid, errno);
-	}
-
-	tst_resm(TPASS, "shmget");
+	key = GETIPCKEY();
 
-/*----------------------------------------------------------------*/
+	shmid = SAFE_SHMGET(key, SHMSIZE, IPC_CREAT | 0666);
 
-	cp = shmat(shmid, NULL, 0);
+	cp = SAFE_SHMAT(shmid, NULL, 0);
+	memcpy(cp, tst_rand_data, SHMSIZE);
 
-	if (cp == (char *)-1) {
-		perror("shmat");
-		tst_resm(TFAIL, "shmat Failed: shmid = %d, errno = %d",
-			 shmid, errno);
-		rm_shm(shmid);
-		tst_exit();
-	}
+	SAFE_SHMCTL(shmid, IPC_RMID, NULL);
 
-	*cp = '1';
-	*(cp + 1) = '2';
-
-	tst_resm(TPASS, "shmat");
-
-/*----------------------------------------------------------------*/
-
-	rm_shm(shmid);
-
-	if (*cp != '1' || *(cp + 1) != '2') {
-		tst_resm(TFAIL,
-			 "Error in shared memory contents: shmid = %d",
-			 shmid);
-	}
-
-	tst_resm(TPASS, "Correct shared memory contents");
-
-/*------------------------------------------------------------------*/
-
-	tst_exit();
+	TST_EXP_EQ_STRN(cp, tst_rand_data, SHMSIZE);
 }
 
-static int rm_shm(int shmid)
-{
-	if (shmctl(shmid, IPC_RMID, NULL) == -1) {
-		perror("shmctl");
-		tst_brkm(TFAIL,
-			 NULL,
-			 "shmctl Failed to remove: shmid = %d, errno = %d",
-			 shmid, errno);
-	}
-	return (0);
-}
+static struct tst_test test = {
+	.test_all = run,
+};

---
base-commit: df591113afeb31107bc45bd5ba28a99b556d1028
change-id: 20250623-conversions-shmt-46f5b6ac96de

Best regards,
-- 
Ricardo B. Marlière <rbm@suse.com>