Remove ltp_clone_quick from sysvipc testing suite
PATCH 1/1 Remove ltp_clone_quick from sysvipc testing suite
Signed-off-by Andrea Cervesato <[email protected]>
---
Replaced ltp_clone_quick with SAFE_CLONE
Removed check_newipc because CLONE_NEWIPC is supported from 2.6.x
testcases/kernel/containers/sysvipc/common.h | 47 +++++++------------ .../kernel/containers/sysvipc/mesgq_nstest.c | 13 ++--- .../kernel/containers/sysvipc/msg_comm.c | 19 ++------ .../kernel/containers/sysvipc/sem_comm.c | 19 ++------ .../kernel/containers/sysvipc/sem_nstest.c | 12 ++--- .../kernel/containers/sysvipc/semtest_2ns.c | 15 ++---- .../kernel/containers/sysvipc/shm_comm.c | 19 ++------ .../kernel/containers/sysvipc/shmem_2nstest.c | 15 ++---- .../kernel/containers/sysvipc/shmnstest.c | 10 +--- 9 files changed, 48 insertions(+), 121 deletions(-)
testcases/kernel/containers/sysvipc/common.h +16 -31
@@ -19,24 +19,7 @@ enum { T_NONE, }; -static int dummy_child (void *v) -{ - (void )v; -return 0 ; -} - -static void check_newipc (void ) -{ -int pid, status; - - pid =ltp_clone_quick (CLONE_NEWIPC |SIGCHLD , dummy_child,NULL ); -if (pid <0 ) -tst_brk (TCONF |TERRNO ,"CLONE_NEWIPC not supported" ); - -SAFE_WAITPID (pid, &status,0 ); -} - -static inline int get_clone_unshare_enum (const char * str_op) +static inline int get_clone_unshare_enum (const char *str_op) {int use_clone;
@@ -54,16 +37,19 @@ static inline int get_clone_unshare_enum(const char* str_op)return use_clone; } -static void clone_test (unsigned long clone_flags,int (*fn1)(void *arg),void *arg1) +static void clone_test (unsigned long clone_flags,void (*fn1)()) { +const struct tst_clone_args clone_args = { clone_flags,SIGCHLD };int pid; - pid =ltp_clone_quick (clone_flags |SIGCHLD , fn1, arg1); -if (pid <0 ) -tst_brk (TBROK |TERRNO ,"ltp_clone_quick error" ); + pid =SAFE_CLONE (&clone_args); +if (!pid) { +fn1 (); +exit (0 ); + } } -static void unshare_test (unsigned long clone_flags,int (*fn1)(void *arg),void *arg1) +static void unshare_test (unsigned long clone_flags,void (*fn1)()) {int pid;
@@ -71,34 +57,33 @@ static void unshare_test(unsigned long clone_flags, int (*fn1)(void *arg), voidif (!pid) {SAFE_UNSHARE (clone_flags); -fn1 (arg1); +fn1 ();exit (0 ); } } -static void plain_test (int (*fn1)(void *arg),void *arg1) +static void plain_test (void (*fn1)()) {int pid; pid =SAFE_FORK ();if (!pid) { -fn1 (arg1); +fn1 ();exit (0 ); } } -static void clone_unshare_test (int use_clone,unsigned long clone_flags, -int (*fn1)(void *arg),void *arg1) +static void clone_unshare_test (int use_clone,unsigned long clone_flags,void (*fn1)()) {switch (use_clone) {case T_NONE : -plain_test (fn1, arg1); +plain_test (fn1);break ;case T_CLONE : -clone_test (clone_flags, fn1, arg1); +clone_test (clone_flags, fn1);break ;case T_UNSHARE : -unshare_test (clone_flags, fn1, arg1); +unshare_test (clone_flags, fn1);break ;default :tst_brk (TBROK ,"%s: bad use_clone option: %d" , __FUNCTION__, use_clone);
testcases/kernel/containers/sysvipc/mesgq_nstest.c +4 -9
@@ -42,7 +42,7 @@ struct msg_buf {char mtext[80 ]; }; -static int check_mesgq(LTP_ATTRIBUTE_UNUSED void *vtest) +static void check_mesgq (void ) {int id, n;struct msg_buf msg = {};
@@ -55,7 +55,7 @@ static int check_mesgq(LTP_ATTRIBUTE_UNUSED void *vtest)else tst_res (TPASS ,"%s: container didn't find mesgq" , str_op); -return 0 ; +return ; }if (use_clone ==T_NONE ) {
@@ -68,11 +68,10 @@ static int check_mesgq(LTP_ATTRIBUTE_UNUSED void *vtest)if (strcmp (msg.mtext,MSG_TEXT ))tst_res (TFAIL ,"Received the wrong text message" ); -return 0 ; +return ; }tst_res (TFAIL ,"%s: container init process found mesgq" , str_op); -return 0 ; }static void run (void )
@@ -87,16 +86,12 @@ static void run(void)tst_res (TINFO ,"mesgq namespaces test: %s" , str_op); -clone_unshare_test (use_clone,CLONE_NEWIPC , check_mesgq,NULL ); +clone_unshare_test (use_clone,CLONE_NEWIPC , check_mesgq); }static void setup (void ) { use_clone =get_clone_unshare_enum (str_op); - -if (use_clone !=T_NONE ) -check_newipc (); - ipc_id =SAFE_MSGGET (KEY_VAL ,IPC_CREAT |IPC_EXCL |0600 ); }
testcases/kernel/containers/sysvipc/msg_comm.c +5 -14
@@ -38,7 +38,7 @@ struct sysv_msg {char mtext[1 ]; }; -static int chld1_msg(LTP_ATTRIBUTE_UNUSED void *arg) +static void chld1_msg (void ) {int id;struct sysv_msg m = {
@@ -66,11 +66,9 @@ static int chld1_msg(LTP_ATTRIBUTE_UNUSED void *arg)TST_CHECKPOINT_WAKE (0 );SAFE_MSGCTL (id,IPC_RMID ,NULL ); - -return 0 ; } -static int chld2_msg(LTP_ATTRIBUTE_UNUSED void *arg) +static void chld2_msg (void ) {int id;struct sysv_msg m = {
@@ -85,24 +83,17 @@ static int chld2_msg(LTP_ATTRIBUTE_UNUSED void *arg)TST_CHECKPOINT_WAKE_AND_WAIT (0 );SAFE_MSGCTL (id,IPC_RMID ,NULL ); - -return 0 ; }static void run (void ) { -clone_unshare_test (T_CLONE ,CLONE_NEWIPC , chld1_msg,NULL ); -clone_unshare_test (T_CLONE ,CLONE_NEWIPC , chld2_msg,NULL ); -} - -static void setup (void ) -{ -check_newipc (); +clone_unshare_test (T_CLONE ,CLONE_NEWIPC , chld1_msg); +clone_unshare_test (T_CLONE ,CLONE_NEWIPC , chld2_msg); }static struct tst_test test = { .test_all = run, - .setup = setup, .needs_root =1 , .needs_checkpoints =1 , + .forks_child =1 , };
testcases/kernel/containers/sysvipc/sem_comm.c +5 -14
@@ -33,7 +33,7 @@#define TESTKEY 124426L -static int chld1_sem(LTP_ATTRIBUTE_UNUSED void *arg) +static void chld1_sem (void ) {int id;struct sembuf sm = {
@@ -56,11 +56,9 @@ static int chld1_sem(LTP_ATTRIBUTE_UNUSED void *arg)TST_CHECKPOINT_WAKE_AND_WAIT (0 );SAFE_SEMCTL (id,0 ,IPC_RMID ); - -return 0 ; } -static int chld2_sem(LTP_ATTRIBUTE_UNUSED void *arg) +static void chld2_sem (void ) {int id;struct sembuf sm = {
@@ -93,24 +91,17 @@ static int chld2_sem(LTP_ATTRIBUTE_UNUSED void *arg)TST_CHECKPOINT_WAKE (0 );SAFE_SEMCTL (id,0 ,IPC_RMID ); - -return 0 ; }static void run (void ) { -clone_unshare_test (T_CLONE ,CLONE_NEWIPC , chld1_sem,NULL ); -clone_unshare_test (T_CLONE ,CLONE_NEWIPC , chld2_sem,NULL ); -} - -static void setup (void ) -{ -check_newipc (); +clone_unshare_test (T_CLONE ,CLONE_NEWIPC , chld1_sem); +clone_unshare_test (T_CLONE ,CLONE_NEWIPC , chld2_sem); }static struct tst_test test = { .test_all = run, - .setup = setup, .needs_root =1 , .needs_checkpoints =1 , + .forks_child =1 , };
testcases/kernel/containers/sysvipc/sem_nstest.c +3 -9
@@ -35,7 +35,7 @@ static char *str_op;static int use_clone;static int ipc_id =-1 ; -static int check_semaphore(LTP_ATTRIBUTE_UNUSED void *vtest) +static void check_semaphore (void ) {int id;
@@ -47,7 +47,7 @@ static int check_semaphore(LTP_ATTRIBUTE_UNUSED void *vtest)else tst_res (TPASS ,"%s: container didn't find semaphore" , str_op); -return 0 ; +return ; }tst_res (TINFO ,"PID %d: fetched existing semaphore..id = %d" ,getpid (), id);
@@ -56,22 +56,16 @@ static int check_semaphore(LTP_ATTRIBUTE_UNUSED void *vtest)tst_res (TPASS ,"Plain cloned process found semaphore inside container" ); else tst_res(TFAIL, "%s: Container init process found semaphore", str_op); - -return 0 ; }static void run (void ) { -clone_unshare_test (use_clone,CLONE_NEWIPC , check_semaphore,NULL ); +clone_unshare_test (use_clone,CLONE_NEWIPC , check_semaphore); }static void setup (void ) { use_clone =get_clone_unshare_enum (str_op); - -if (use_clone !=T_NONE ) -check_newipc (); - ipc_id =SAFE_SEMGET (MY_KEY ,1 ,IPC_CREAT |IPC_EXCL |0666 ); }
testcases/kernel/containers/sysvipc/semtest_2ns.c +4 -11
@@ -40,7 +40,7 @@static char *str_op;static int use_clone; -static int check_sem1(LTP_ATTRIBUTE_UNUSED void *vtest) +static void check_sem1 (void ) {int id;struct sembuf sm = {
@@ -62,11 +62,9 @@ static int check_sem1(LTP_ATTRIBUTE_UNUSED void *vtest)TST_CHECKPOINT_WAKE_AND_WAIT (0 );SAFE_SEMCTL (id,IPC_RMID ,0 ); - -return 0 ; } -static int check_sem2(LTP_ATTRIBUTE_UNUSED void *vtest) +static void check_sem2 (void ) {int id;struct sembuf sm = {
@@ -112,22 +110,17 @@ static int check_sem2(LTP_ATTRIBUTE_UNUSED void *vtest) }TST_CHECKPOINT_WAKE (0 ); - -return 0 ; }static void run (void ) { -clone_unshare_test (use_clone,CLONE_NEWIPC , check_sem1,NULL ); -clone_unshare_test (use_clone,CLONE_NEWIPC , check_sem2,NULL ); +clone_unshare_test (use_clone,CLONE_NEWIPC , check_sem1); +clone_unshare_test (use_clone,CLONE_NEWIPC , check_sem2); }static void setup (void ) { use_clone =get_clone_unshare_enum (str_op); - -if (use_clone !=T_NONE ) -check_newipc (); }static void cleanup (void )
testcases/kernel/containers/sysvipc/shm_comm.c +5 -14
@@ -35,7 +35,7 @@#define TESTKEY 124426L#define SHMSIZE 50 -static int chld1_shm(LTP_ATTRIBUTE_UNUSED void *arg) +static void chld1_shm (void ) {int id;char *shmem;
@@ -56,11 +56,9 @@ static int chld1_shm(LTP_ATTRIBUTE_UNUSED void *arg)SAFE_SHMDT (shmem);SAFE_SHMCTL (id,IPC_RMID ,NULL ); - -return 0 ; } -static int chld2_shm(LTP_ATTRIBUTE_UNUSED void *arg) +static void chld2_shm (void ) {int id;char *shmem;
@@ -77,24 +75,17 @@ static int chld2_shm(LTP_ATTRIBUTE_UNUSED void *arg)SAFE_SHMDT (shmem);SAFE_SHMCTL (id,IPC_RMID ,NULL ); - -return 0 ; }static void run (void ) { -clone_unshare_test (T_CLONE ,CLONE_NEWIPC , chld1_shm,NULL ); -clone_unshare_test (T_CLONE ,CLONE_NEWIPC , chld2_shm,NULL ); -} - -static void setup (void ) -{ -check_newipc (); +clone_unshare_test (T_CLONE ,CLONE_NEWIPC , chld1_shm); +clone_unshare_test (T_CLONE ,CLONE_NEWIPC , chld2_shm); }static struct tst_test test = { .test_all = run, - .setup = setup, .needs_root =1 , .needs_checkpoints =1 , + .forks_child =1 , };
testcases/kernel/containers/sysvipc/shmem_2nstest.c +4 -11
@@ -40,7 +40,7 @@static char *str_op;static int use_clone; -static int check_shmem1(LTP_ATTRIBUTE_UNUSED void *vtest) +static void check_shmem1 (void ) {int id;
@@ -51,11 +51,9 @@ static int check_shmem1(LTP_ATTRIBUTE_UNUSED void *vtest)TST_CHECKPOINT_WAKE_AND_WAIT (0 );SAFE_SHMCTL (id,IPC_RMID ,NULL ); - -return 0 ; } -static int check_shmem2(LTP_ATTRIBUTE_UNUSED void *vtest) +static void check_shmem2 (void ) {TST_CHECKPOINT_WAIT (0 );
@@ -74,22 +72,17 @@ static int check_shmem2(LTP_ATTRIBUTE_UNUSED void *vtest) }TST_CHECKPOINT_WAKE (0 ); - -return 0 ; }static void run (void ) { -clone_unshare_test (use_clone,CLONE_NEWIPC , check_shmem1,NULL ); -clone_unshare_test (use_clone,CLONE_NEWIPC , check_shmem2,NULL ); +clone_unshare_test (use_clone,CLONE_NEWIPC , check_shmem1); +clone_unshare_test (use_clone,CLONE_NEWIPC , check_shmem2); }static void setup (void ) { use_clone =get_clone_unshare_enum (str_op); - -if (use_clone !=T_NONE ) -check_newipc (); }static struct tst_test test = {
testcases/kernel/containers/sysvipc/shmnstest.c +2 -8
@@ -27,7 +27,7 @@ static char *str_op;static int use_clone;static int ipc_id =-1 ; -static int check_shmid(LTP_ATTRIBUTE_UNUSED void *vtest) +static void check_shmid (void ) {TEST (shmget (TESTKEY ,100 ,0 ));if (TST_RET <0 ) {
@@ -41,22 +41,16 @@ static int check_shmid(LTP_ATTRIBUTE_UNUSED void *vtest)else tst_res (TFAIL ,"%s: child process found shmid" , str_op); } - -return 0 ; }static void run (void ) { -clone_unshare_test (use_clone,CLONE_NEWIPC , check_shmid,NULL ); +clone_unshare_test (use_clone,CLONE_NEWIPC , check_shmid); }static void setup (void ) { use_clone =get_clone_unshare_enum (str_op); - -if (use_clone !=T_NONE ) -check_newipc (); - ipc_id =shmget (TESTKEY ,100 ,IPC_CREAT ); }
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Andrea,
Quoted 2 lines
Replaced
ltp_clone_quickwithSAFE_CLONE
Removedcheck_newipcbecauseCLONE_NEWIPCis supported from 2.6.x
Indeed 2.6.19 is old enough.
Thanks, merged!
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp