[LTP] [PATCH 5/5] syscalls/ipc: semctl07: Convert to new API and cleanup
Feiyu Zhu
zhufy.jy@cn.fujitsu.com
Wed Jan 6 08:27:43 CET 2021
Signed-off-by: Feiyu Zhu <zhufy.jy@cn.fujitsu.com>
---
testcases/kernel/syscalls/ipc/semctl/Makefile | 4 +-
testcases/kernel/syscalls/ipc/semctl/semctl07.c | 179 ++++++++----------------
2 files changed, 62 insertions(+), 121 deletions(-)
diff --git a/testcases/kernel/syscalls/ipc/semctl/Makefile b/testcases/kernel/syscalls/ipc/semctl/Makefile
index 4923010..7b7a11d 100644
--- a/testcases/kernel/syscalls/ipc/semctl/Makefile
+++ b/testcases/kernel/syscalls/ipc/semctl/Makefile
@@ -7,7 +7,7 @@ LTPLIBS = ltpipc ltpnewipc
include $(top_srcdir)/include/mk/testcases.mk
-semctl01 semctl06 semctl07: LTPLDLIBS = -lltpipc
-semctl02 semctl03 semctl04 semctl05 semctl08 semctl09: LTPLDLIBS = -lltpnewipc
+semctl01 semctl06: LTPLDLIBS = -lltpipc
+semctl02 semctl03 semctl04 semctl05 semctl07 semctl08 semctl09: LTPLDLIBS = -lltpnewipc
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl07.c b/testcases/kernel/syscalls/ipc/semctl/semctl07.c
index 5d7fad3..df92482 100644
--- a/testcases/kernel/syscalls/ipc/semctl/semctl07.c
+++ b/testcases/kernel/syscalls/ipc/semctl/semctl07.c
@@ -1,176 +1,117 @@
+// 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
*/
-
-/* 06/30/2001 Port to Linux nsharoff@us.ibm.com */
-/* 10/30/2002 Port to LTP dbarrera@us.ibm.com */
-
/*
- * NAME
- * semctl07
- *
- * CALLS
- * semctl(2) semget(2)
- *
- * ALGORITHM
+ * DESCRIPTION
* Get and manipulate a set of semaphores.
*
- * RESTRICTIONS
- *
* HISTORY
- * 10/03/2008 Renaud Lottiaux (Renaud.Lottiaux@kerlabs.com)
- * - Fix concurrency issue. A statically defined key was used. Leading
- * to conflict with other instances of the same test.
+ * 06/30/2001 Port to Linux nsharoff@us.ibm.com
+ * 10/30/2002 Port to LTP dbarrera@us.ibm.com
+ * 10/03/2008 Renaud Lottiaux (Renaud.Lottiaux@kerlabs.com)
+ * - Fix concurrency issue. A statically defined key was used. Leading
+ * to conflict with other instances of the same test.
*/
-#include <sys/types.h>
-#include <sys/ipc.h>
#include <sys/sem.h>
-#include <signal.h>
#include <errno.h>
#include <stdio.h>
#include <sys/wait.h>
-#include "ipcsem.h"
-#include "test.h"
-
-void setup(void);
-void cleanup(void);
-
-char *TCID = "semctl07";
-int TST_TOTAL = 1;
+#include "tst_test.h"
+#include "tst_safe_sysv_ipc.h"
+#include "libnewipc.h"
+#include "lapi/sem.h"
-key_t key;
-int semid = -1, nsems;
+static int semid = -1;
+static unsigned long nsems;
-int main(int argc, char *argv[])
+static void verify_semctl(void)
{
int status;
struct semid_ds buf_ds;
union semun arg;
- tst_parse_opts(argc, argv, NULL, NULL);
-
- setup();
-
arg.buf = &buf_ds;
- if ((status = semctl(semid, 0, IPC_STAT, arg)) == -1) {
- tst_resm(TFAIL, "semctl() failed errno = %d", errno);
- semctl(semid, 1, IPC_RMID, arg);
-
- }
-
- /*
- * Check contents of semid_ds structure.
- */
+ status = SAFE_SEMCTL(semid, 0, IPC_STAT, arg);
if (arg.buf->sem_nsems != nsems) {
- tst_resm(TFAIL, "error: unexpected number of sems %lu",
+ tst_res(TFAIL, "error: unexpected number of sems %lu",
arg.buf->sem_nsems);
-
}
+
if (arg.buf->sem_perm.uid != getuid()) {
- tst_resm(TFAIL, "error: unexpected uid %d",
+ tst_res(TFAIL, "error: unexpected uid %d",
arg.buf->sem_perm.uid);
-
}
+
if (arg.buf->sem_perm.gid != getgid()) {
- tst_resm(TFAIL, "error: unexpected gid %d",
+ tst_res(TFAIL, "error: unexpected gid %d",
arg.buf->sem_perm.gid);
-
}
+
if (arg.buf->sem_perm.cuid != getuid()) {
- tst_resm(TFAIL, "error: unexpected cuid %d",
+ tst_res(TFAIL, "error: unexpected cuid %d",
arg.buf->sem_perm.cuid);
-
}
+
if (arg.buf->sem_perm.cgid != getgid()) {
- tst_resm(TFAIL, "error: unexpected cgid %d",
+ tst_res(TFAIL, "error: unexpected cgid %d",
arg.buf->sem_perm.cgid);
-
}
- if ((status = semctl(semid, 0, GETVAL, arg)) == -1) {
- tst_resm(TFAIL, "semctl(GETVAL) failed errno = %d", errno);
- }
+ if ((status = semctl(semid, 0, GETVAL, arg)) == -1)
+ tst_res(TFAIL, "semctl(GETVAL) failed errno = %d", errno);
+
arg.val = 1;
- if ((status = semctl(semid, 0, SETVAL, arg)) == -1) {
- tst_resm(TFAIL, "SEMCTL(SETVAL) failed errno = %d", errno);
+ if ((status = semctl(semid, 0, SETVAL, arg)) == -1)
+ tst_res(TFAIL, "SEMCTL(SETVAL) failed errno = %d", errno);
- }
- if ((status = semctl(semid, 0, GETVAL, arg)) == -1) {
- tst_resm(TFAIL, "semctl(GETVAL) failed errno = %d", errno);
+ if ((status = semctl(semid, 0, GETVAL, arg)) == -1)
+ tst_res(TFAIL, "semctl(GETVAL) failed errno = %d", errno);
- }
- if (status != arg.val) {
- tst_resm(TFAIL, "error: unexpected value %d", status);
+ if (status != arg.val)
+ tst_res(TFAIL, "error: unexpected value %d", status);
- }
- if ((status = semctl(semid, 0, GETPID, arg)) == -1) {
- tst_resm(TFAIL, "semctl(GETPID) failed errno = %d", errno);
+ if ((status = semctl(semid, 0, GETPID, arg)) == -1)
+ tst_res(TFAIL, "semctl(GETPID) failed errno = %d", errno);
- }
status = getpid();
- if (status == 0) {
- tst_resm(TFAIL, "error: unexpected pid %d", status);
+ if (status == 0)
+ tst_res(TFAIL, "error: unexpected pid %d", status);
- }
- if ((status = semctl(semid, 0, GETNCNT, arg)) == -1) {
- tst_resm(TFAIL, "semctl(GETNCNT) failed errno = %d", errno);
+ if ((status = semctl(semid, 0, GETNCNT, arg)) == -1)
+ tst_res(TFAIL, "semctl(GETNCNT) failed errno = %d", errno);
- }
- if (status != 0) {
- tst_resm(TFAIL, "error: unexpected semncnt %d", status);
+ if (status != 0)
+ tst_res(TFAIL, "error: unexpected semncnt %d", status);
- }
- if ((status = semctl(semid, 0, GETZCNT, arg)) == -1) {
- tst_resm(TFAIL, "semctl(GETZCNT) failed errno = %d", errno);
-
- }
- if (status != 0) {
- tst_resm(TFAIL, "error: unexpected semzcnt %d", status);
-
- }
+ if ((status = semctl(semid, 0, GETZCNT, arg)) == -1)
+ tst_res(TFAIL, "semctl(GETZCNT) failed errno = %d", errno);
- tst_resm(TPASS, "semctl07 ran successfully!");
+ if (status != 0)
+ tst_res(TFAIL, "error: unexpected semzcnt %d", status);
- cleanup();
- tst_exit();
+ tst_res(TPASS, "semctl07 ran successfully!");
}
-void setup(void)
+static void setup(void)
{
- tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
- TEST_PAUSE;
-
- tst_tmpdir();
-
- /* get an IPC resource key */
- key = getipckey();
+ key_t key = GETIPCKEY();
nsems = 1;
- if ((semid = semget(key, nsems, SEM_RA | IPC_CREAT)) == -1) {
- tst_brkm(TFAIL, NULL, "semget() failed errno = %d", errno);
- }
+ semid = SAFE_SEMGET(key, nsems, SEM_RA | IPC_CREAT);
}
-void cleanup(void)
+static void cleanup(void)
{
- rm_sema(semid);
- tst_rmdir();
+ if (semid != -1)
+ SAFE_SEMCTL(semid, 0, IPC_RMID);
}
+
+static struct tst_test test = {
+ .setup = setup,
+ .cleanup = cleanup,
+ .needs_root = 1,
+ .test_all = verify_semctl,
+};
--
1.8.3.1
More information about the ltp
mailing list