[LTP] [PATCH v2 2/9] mem: shmt03: Convert to new API

[Ricardo B. Marlière]

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

Signed-off-by: Ricardo B. Marlière <rbm@suse.com>
---
 testcases/kernel/mem/shmt/Makefile |   3 +-
 testcases/kernel/mem/shmt/shmt03.c | 133 ++++++-------------------------------
 2 files changed, 24 insertions(+), 112 deletions(-)

diff --git a/testcases/kernel/mem/shmt/Makefile b/testcases/kernel/mem/shmt/Makefile
index a54bcfe190c192d81b1eeee47b9ec6a5fab24427..4c5f926c4e394445c7d2d7005c47414255670d40 100644
--- a/testcases/kernel/mem/shmt/Makefile
+++ b/testcases/kernel/mem/shmt/Makefile
@@ -26,6 +26,7 @@ LTPLIBS = newipc
 
 include $(top_srcdir)/include/mk/testcases.mk
 
-shmt02: LTPLDLIBS  = -lltpnewipc
+shmt02: LTPLDLIBS = -lltpnewipc
+shmt03: LTPLDLIBS = -lltpnewipc
 
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/mem/shmt/shmt03.c b/testcases/kernel/mem/shmt/shmt03.c
index 08c27ce029721dea1db04025fa18ba19ad34f507..63f5a7b450b594aae4696cea2cd8031f5248d4aa 100644
--- a/testcases/kernel/mem/shmt/shmt03.c
+++ b/testcases/kernel/mem/shmt/shmt03.c
@@ -1,133 +1,44 @@
+// 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
- *	shmt3
- *
- * CALLS
- *	shmctl(2) shmget(2) shmat(2)
- *
- * ALGORITHM
+/*\
  * Create one shared memory segment and attach it twice to the same process,
  * at an address that is chosen by the system. After the first attach has
  * completed, write to it and then do the second attach.
  * Verify that the doubly attached segment contains the same data.
- *
  */
 
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <errno.h>
-
-/** LTP Port **/
-#include "test.h"
-
-char *TCID = "shmt03";		/* Test program identifier.    */
-int TST_TOTAL = 4;		/* 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 	SUCCESSFUL	 1
+#define SHMSIZE 16
 
-int first_attach, second_attach;
-static int rm_shm(int);
-
-int main(void)
+static void run(void)
 {
 	char *cp1, *cp2;
 	int shmid;
 	key_t key;
 
-	key = (key_t) getpid();
-	errno = 0;
-
-/*------------------------------------------------------------*/
-
-	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);
 
-	if ((cp1 = shmat(shmid, NULL, 0)) == (char *)-1) {
-		perror("shmat");
-		tst_resm(TFAIL, "shmat Failed: shmid = %d, errno = %d",
-			 shmid, errno);
-	} else {
-		*cp1 = '1';
-		*(cp1 + 5 * K_1) = '2';
-		first_attach = SUCCESSFUL;
-	}
+	cp1 = SAFE_SHMAT(shmid, NULL, 0);
+	memcpy(cp1, tst_rand_data, SHMSIZE);
 
-	tst_resm(TPASS, "1st shmat");
+	cp2 = SAFE_SHMAT(shmid, NULL, 0);
+	TST_EXP_EQ_LI(memcmp(cp2, tst_rand_data, SHMSIZE), 0);
 
-/*------------------------------------------------------------*/
-
-	if ((cp2 = shmat(shmid, NULL, 0)) == (char *)-1) {
-		perror("shmat");
-		tst_resm(TFAIL, "shmat Failed: shmid = %d, errno = %d",
-			 shmid, errno);
-	} else {
-		second_attach = SUCCESSFUL;
-		if ((*cp2 != '1' || *(cp2 + 5 * K_1) != '2') &&
-		    first_attach == SUCCESSFUL) {
-			tst_resm(TFAIL, "Error: Shared memory contents");
-		}
-	}
-
-	tst_resm(TPASS, "2nd shmat");
-
-/*---------------------------------------------------------------*/
-
-	rm_shm(shmid);
-
-	if (first_attach && second_attach) {
-		if (*cp2 != '1' || *(cp2 + 5 * K_1) != '2' ||
-		    *cp1 != '1' || *(cp1 + 5 * K_1) != '2') {
-			tst_resm(TFAIL, "Error: Shared memory contents");
-		}
-	}
-
-	tst_resm(TPASS, "Correct shared memory contents");
-/*-----------------------------------------------------------------*/
-	tst_exit();
+	SAFE_SHMCTL(shmid, IPC_RMID, NULL);
 }
 
-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,
+};

-- 
2.50.0