[LTP] [PATCH 5/9] mem: shmt06: Remove in favor of shmt04
Ricardo B. Marlière
rbm@suse.com
Fri Jun 27 18:48:00 CEST 2025
From: Ricardo B. Marlière <rbm@suse.com>
The shmt06 is almost a duplicate of shmt04, simply add its requirement and
delete it.
Signed-off-by: Ricardo B. Marlière <rbm@suse.com>
---
runtest/mm | 1 -
testcases/kernel/mem/.gitignore | 1 -
testcases/kernel/mem/shmt/shmt04.c | 6 +
testcases/kernel/mem/shmt/shmt06.c | 220 -------------------------------------
4 files changed, 6 insertions(+), 222 deletions(-)
diff --git a/runtest/mm b/runtest/mm
index 5566a77425c6c6e426115b9cfd68b383009dbbb1..41d624ad86fc354cc1284bbcee192420a93fa93a 100644
--- a/runtest/mm
+++ b/runtest/mm
@@ -28,7 +28,6 @@ shmt02 shmt02
shmt03 shmt03
shmt04 shmt04
shmt05 shmt05
-shmt06 shmt06
shmt07 shmt07
shmt08 shmt08
shmt09 shmt09
diff --git a/testcases/kernel/mem/.gitignore b/testcases/kernel/mem/.gitignore
index e24e96001731a694cf7d6083af36e31f1ac72ed1..b4455de51d6d6a9cc3d8b7ff392fc3ea9e95890a 100644
--- a/testcases/kernel/mem/.gitignore
+++ b/testcases/kernel/mem/.gitignore
@@ -89,7 +89,6 @@
/shmt/shmt03
/shmt/shmt04
/shmt/shmt05
-/shmt/shmt06
/shmt/shmt07
/shmt/shmt08
/shmt/shmt09
diff --git a/testcases/kernel/mem/shmt/shmt04.c b/testcases/kernel/mem/shmt/shmt04.c
index 83c12a6fe287d7feabd1fbec5a33f17886ba1c13..bda235de621ee8f00d882b4d0526b724cb6b7383 100644
--- a/testcases/kernel/mem/shmt/shmt04.c
+++ b/testcases/kernel/mem/shmt/shmt04.c
@@ -35,6 +35,12 @@ static void run(void)
shmid = SAFE_SHMGET(key, SHMSIZE, IPC_CREAT | 0666);
cp = SAFE_SHMAT(shmid, NULL, 0);
TST_EXP_EQ_LI(memcmp(cp, tst_rand_data, SHMSIZE), 0);
+ /*
+ * Attach the segment to a different address
+ * and verify it's contents again.
+ */
+ cp = SAFE_SHMAT(shmid, NULL, 0);
+ TST_EXP_EQ_LI(memcmp(cp, tst_rand_data, SHMSIZE), 0);
SAFE_SHMCTL(shmid, IPC_RMID, NULL);
return;
}
diff --git a/testcases/kernel/mem/shmt/shmt06.c b/testcases/kernel/mem/shmt/shmt06.c
deleted file mode 100644
index e88ac45c98cd01a5643ab996a7a2f9eb73eb7e9d..0000000000000000000000000000000000000000
--- a/testcases/kernel/mem/shmt/shmt06.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- *
- * 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
- */
-
-/* 12/20/2002 Port to LTP robbiew@us.ibm.com */
-/* 06/30/2001 Port to Linux nsharoff@us.ibm.com */
-
-/*
- * NAME
- * shmt06
- *
- * CALLS
- * shmctl(2) shmget(2) shmat(2)
- *
- * ALGORITHM
- * Parent process forks a child. Child pauses until parent has created
- * a shared memory segment, attached to it and written to it too. At that
- * time child gets the shared memory segment id, attaches to it at two
- * different addresses than the parents and verifies that their contents
- * are the same as the contents of the parent attached segment.
- *
- */
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <sys/utsname.h>
-#include <signal.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#define SIZE 16*1024
-
-/** LTP Port **/
-#include "test.h"
-
-char *TCID = "shmt06"; /* Test program identifier. */
-int TST_TOTAL = 2; /* Total number of test cases. */
-/**************/
-
-key_t key;
-sigset_t set;
-
-int child();
-static int rm_shm(int);
-
-int main(void)
-{
- char *cp = NULL;
- int pid, pid1, shmid;
- int status;
-
- key = (key_t) getpid();
-
- sigemptyset(&set);
- sigaddset(&set, SIGUSR1);
- sigprocmask(SIG_BLOCK, &set, NULL);
-
- pid = fork();
- switch (pid) {
- case -1:
- tst_brkm(TBROK, NULL, "fork failed");
- case 0:
- child();
- }
-
-/*------------------------------------------------------*/
-
- if ((shmid = shmget(key, SIZE, IPC_CREAT | 0666)) < 0) {
- perror("shmget");
- tst_resm(TFAIL, "Error: shmget: shmid = %d, errno = %d",
- shmid, errno);
- /*
- * kill the child if parent failed to do the attach
- */
- (void)kill(pid, SIGINT);
- } else {
- cp = shmat(shmid, NULL, 0);
-
- if (cp == (char *)-1) {
- perror("shmat");
- tst_resm(TFAIL,
- "Error: shmat: shmid = %d, errno = %d",
- shmid, errno);
-
- /* kill the child if parent failed to do the attch */
-
- kill(pid, SIGINT);
-
- /* remove shared memory segment */
-
- rm_shm(shmid);
-
- tst_exit();
- }
- *cp = 'A';
- *(cp + 1) = 'B';
- *(cp + 2) = 'C';
-
- kill(pid, SIGUSR1);
- while ((pid1 = wait(&status)) < 0 && (errno == EINTR)) ;
- if (pid1 != pid) {
- tst_resm(TFAIL, "Waited on the wrong child");
- tst_resm(TFAIL,
- "Error: wait_status = %d, pid1= %d", status,
- pid1);
- }
- }
-
- tst_resm(TPASS, "shmget,shmat");
-
-/*---------------------------------------------------------------*/
-
- if (shmdt(cp) < 0) {
- tst_resm(TFAIL, "shmdt");
- }
-
- tst_resm(TPASS, "shmdt");
-
-/*-------------------------------------------------------------*/
-
- rm_shm(shmid);
- tst_exit();
-}
-
-int child(void)
-{
- int shmid, chld_pid;
- char *cp;
- int sig;
-
- sigwait(&set, &sig);
- chld_pid = getpid();
-
- if ((shmid = shmget(key, SIZE, 0)) < 0) {
- perror("shmget:child process");
- tst_resm(TFAIL,
- "Error: shmget: errno=%d, shmid=%d, child_pid=%d",
- errno, shmid, chld_pid);
- } else {
- cp = shmat(shmid, NULL, 0);
-
- if (cp == (char *)-1) {
- perror("shmat:child process");
- tst_resm(TFAIL,
- "Error: shmat: errno=%d, shmid=%d, child_pid=%d",
- errno, shmid, chld_pid);
- } else {
- if (*cp != 'A') {
- tst_resm(TFAIL, "child: not A");
- }
- if (*(cp + 1) != 'B') {
- tst_resm(TFAIL, "child: not B");
- }
- if (*(cp + 2) != 'C') {
- tst_resm(TFAIL, "child: not C");
- }
- if (*(cp + 8192) != 0) {
- tst_resm(TFAIL, "child: not 0");
- }
- }
-
- /*
- * Attach the segment to a different addresse
- * and verify it's contents again.
- */
- cp = shmat(shmid, NULL, 0);
-
- if (cp == (char *)-1) {
- perror("shmat:child process");
- tst_resm(TFAIL,
- "Error: shmat: errno=%d, shmid=%d, child_pid=%d",
- errno, shmid, chld_pid);
- } else {
- if (*cp != 'A') {
- tst_resm(TFAIL, "child: not A");
- }
- if (*(cp + 1) != 'B') {
- tst_resm(TFAIL, "child: not B");
- }
- if (*(cp + 2) != 'C') {
- tst_resm(TFAIL, "child: not C");
- }
- if (*(cp + 8192) != 0) {
- tst_resm(TFAIL, "child: not 0");
- }
- }
- }
- tst_exit();
-}
-
-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);
-}
--
2.50.0
More information about the ltp
mailing list