ipc/msgget0*: Make use of IPC related macros
Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
diff --git a/testcases/kernel/syscalls/ipc/msgget/msgget01.c b/testcases/kernel/syscalls/ipc/msgget/msgget01.c
index 8d2db4d..1e9bbeb 100644
--- a/testcases/kernel/syscalls/ipc/msgget/msgget01.c
+++ b/testcases/kernel/syscalls/ipc/msgget/msgget01.c
@@ -28,6 +28,7 @@
#include <sys/msg.h>
#include "tst_test.h"
+#include "tst_safe_sysv_ipc.h"
#include "libnewipc.h"
static int queue_id = -1;
@@ -48,11 +49,9 @@
queue_id = TEST_RETURN;
- if (msgsnd(queue_id, &snd_buf, MSGSIZE, 0) == -1)
- tst_brk(TBROK | TERRNO, "msgsnd() failed");
+ SAFE_MSGSND(queue_id, &snd_buf, MSGSIZE, 0);
- if (msgrcv(queue_id, &rcv_buf, MSGSIZE, MSGTYPE, IPC_NOWAIT) == -1)
- tst_brk(TBROK | TERRNO, "msgrcv() failed");
+ SAFE_MSGRCV(queue_id, &rcv_buf, MSGSIZE, MSGTYPE, IPC_NOWAIT);
if (strcmp(snd_buf.text, rcv_buf.text) == 0)
tst_res(TPASS, "message received = message sent");
diff --git a/testcases/kernel/syscalls/ipc/msgget/msgget02.c b/testcases/kernel/syscalls/ipc/msgget/msgget02.c
index a3fcb38..1886201 100644
--- a/testcases/kernel/syscalls/ipc/msgget/msgget02.c
+++ b/testcases/kernel/syscalls/ipc/msgget/msgget02.c
@@ -34,6 +34,7 @@
#include <pwd.h>
#include "tst_test.h"
+#include "tst_safe_sysv_ipc.h"
#include "libnewipc.h"
static key_t msgkey, msgkey1;
@@ -96,9 +97,7 @@
msgkey = GETIPCKEY();
msgkey1 = GETIPCKEY();
- queue_id = msgget(msgkey, IPC_CREAT | IPC_EXCL);
- if (queue_id == -1)
- tst_brk(TBROK | TERRNO, "can't create message queue");
+ queue_id = SAFE_MSGGET(msgkey, IPC_CREAT | IPC_EXCL);
pw = SAFE_GETPWNAM("nobody");
}