syscalls/ipc: Make use of tst_require_root()
Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
diff --git a/testcases/kernel/syscalls/ipc/lib/ipcmsg.h b/testcases/kernel/syscalls/ipc/lib/ipcmsg.h
index f60769a..b14f6ca 100644
--- a/testcases/kernel/syscalls/ipc/lib/ipcmsg.h
+++ b/testcases/kernel/syscalls/ipc/lib/ipcmsg.h
@@ -57,7 +57,6 @@
extern key_t msgkey; /* the ftok() generated message key */
#endif
-void check_root();
void init_buf(MSGBUF *, int, int);
void rm_queue(int);
diff --git a/testcases/kernel/syscalls/ipc/lib/ipcsem.h b/testcases/kernel/syscalls/ipc/lib/ipcsem.h
index 46dccde..ce4dc37 100644
--- a/testcases/kernel/syscalls/ipc/lib/ipcsem.h
+++ b/testcases/kernel/syscalls/ipc/lib/ipcsem.h
@@ -56,7 +56,6 @@
};
void rm_sema(int sem_id);
-void check_root();
int getipckey();
int getuserid(char *);
diff --git a/testcases/kernel/syscalls/ipc/lib/ipcshm.h b/testcases/kernel/syscalls/ipc/lib/ipcshm.h
index 9b668f3..0521eda 100644
--- a/testcases/kernel/syscalls/ipc/lib/ipcshm.h
+++ b/testcases/kernel/syscalls/ipc/lib/ipcshm.h
@@ -48,7 +48,6 @@
key_t shmkey; /* an IPC key generated by ftok() */
void rm_shm(int shm_id);
-void check_root();
int getipckey();
int getuserid(char*);
diff --git a/testcases/kernel/syscalls/ipc/lib/libipc.c b/testcases/kernel/syscalls/ipc/lib/libipc.c
index a94e1f2..8a625f5 100644
--- a/testcases/kernel/syscalls/ipc/lib/libipc.c
+++ b/testcases/kernel/syscalls/ipc/lib/libipc.c
@@ -30,7 +30,6 @@
* rm_queue()
* init_buf()
* rm_sema()
- * check_root()
* getuserid()
* rm_shm()
*/
@@ -138,16 +137,6 @@
}
/*
- * check_root() - make sure the process ID is root
- */
-void check_root()
-{
- if (geteuid() != 0) {
- tst_brkm(TBROK, cleanup, "test must be run as root");
- }
-}
-
-/*
* getuserid() - return the integer value for the "user" id
*/
int getuserid(char *user)
diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl05.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl05.c
index 0962474..df8e93a 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl05.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl05.c
@@ -160,8 +160,7 @@
*/
void setup(void)
{
- /* check for root as user id of process */
- check_root();
+ tst_require_root(NULL);
tst_sig(FORK, DEF_HANDLER, cleanup);
diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl04.c b/testcases/kernel/syscalls/ipc/semctl/semctl04.c
index 7f1079a..5eb7b2e 100644
--- a/testcases/kernel/syscalls/ipc/semctl/semctl04.c
+++ b/testcases/kernel/syscalls/ipc/semctl/semctl04.c
@@ -172,8 +172,7 @@
*/
void setup(void)
{
- /* check for root as user id of process */
- check_root();
+ tst_require_root(NULL);
tst_sig(FORK, DEF_HANDLER, cleanup);
diff --git a/testcases/kernel/syscalls/ipc/shmat/shmat03.c b/testcases/kernel/syscalls/ipc/shmat/shmat03.c
index 8afbc99..1cacac6 100644
--- a/testcases/kernel/syscalls/ipc/shmat/shmat03.c
+++ b/testcases/kernel/syscalls/ipc/shmat/shmat03.c
@@ -155,8 +155,7 @@
*/
void setup(void)
{
- /* check for root as process owner */
- check_root();
+ tst_require_root(NULL);
tst_sig(FORK, DEF_HANDLER, cleanup);
diff --git a/testcases/kernel/syscalls/ipc/shmctl/shmctl03.c b/testcases/kernel/syscalls/ipc/shmctl/shmctl03.c
index ddfa09e..cdbe449 100644
--- a/testcases/kernel/syscalls/ipc/shmctl/shmctl03.c
+++ b/testcases/kernel/syscalls/ipc/shmctl/shmctl03.c
@@ -177,8 +177,7 @@
*/
void setup(void)
{
- /* check for root as process owner */
- check_root();
+ tst_require_root(NULL);
tst_sig(FORK, DEF_HANDLER, cleanup);
diff --git a/testcases/kernel/syscalls/ipc/shmget/shmget05.c b/testcases/kernel/syscalls/ipc/shmget/shmget05.c
index f111e0b..120de3a 100644
--- a/testcases/kernel/syscalls/ipc/shmget/shmget05.c
+++ b/testcases/kernel/syscalls/ipc/shmget/shmget05.c
@@ -156,8 +156,7 @@
*/
void setup(void)
{
- /* check for root as process owner */
- check_root();
+ tst_require_root(NULL);
tst_sig(FORK, DEF_HANDLER, cleanup);