[v2,06/16] Add SYSV message queue test
Commit Message
Changes from previous version:
- Use __ASSUME_SYSVIPC_SYSCALL instead of __NR_syscall to issue the
wired syscall or the ipc one.
--
This patch adds a simple SYSV message queue test to check for correct
argument passing on kernel. The idea is neither to be an extensive
testing nor to check for any specific Linux test.
* sysvipc/Makefile (tests): Add test-sysvmsg.
* sysvipc/test-sysvmsg.c: New file.
* test-skeleton.c (FAIL_UNSUPPORTED): New define.
---
ChangeLog | 4 ++
sysvipc/Makefile | 2 +
sysvipc/test-sysvmsg.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++++
test-skeleton.c | 2 +
4 files changed, 131 insertions(+)
create mode 100644 sysvipc/test-sysvmsg.c
Comments
On Wed, Nov 02, 2016 at 05:26:43PM -0200, Adhemerval Zanella wrote:
> Changes from previous version:
>
> - Use __ASSUME_SYSVIPC_SYSCALL instead of __NR_syscall to issue the
> wired syscall or the ipc one.
>
> --
>
> This patch adds a simple SYSV message queue test to check for correct
> argument passing on kernel. The idea is neither to be an extensive
> testing nor to check for any specific Linux test.
>
> * sysvipc/Makefile (tests): Add test-sysvmsg.
> * sysvipc/test-sysvmsg.c: New file.
> * test-skeleton.c (FAIL_UNSUPPORTED): New define.
> ---
> ChangeLog | 4 ++
> sysvipc/Makefile | 2 +
> sysvipc/test-sysvmsg.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++++
> test-skeleton.c | 2 +
> 4 files changed, 131 insertions(+)
> create mode 100644 sysvipc/test-sysvmsg.c
>
> diff --git a/sysvipc/Makefile b/sysvipc/Makefile
> index 5f3479e..73bb9cf 100644
> --- a/sysvipc/Makefile
> +++ b/sysvipc/Makefile
> @@ -30,6 +30,8 @@ routines := ftok \
> semop semget semctl semtimedop \
> shmat shmdt shmget shmctl
>
> +tests := test-sysvmsg
> +
> include ../Rules
>
> CFLAGS-msgrcv.c = -fexceptions -fasynchronous-unwind-tables
> diff --git a/sysvipc/test-sysvmsg.c b/sysvipc/test-sysvmsg.c
> new file mode 100644
> index 0000000..9393c83
> --- /dev/null
> +++ b/sysvipc/test-sysvmsg.c
> @@ -0,0 +1,123 @@
> +/* Basic tests for SYSV message queue functions.
> + Copyright (C) 2016 Free Software Foundation, Inc.
> + This file is part of the GNU C Library.
> +
> + The GNU C Library is free software; you can redistribute it and/or
> + modify it under the terms of the GNU Lesser General Public
> + License as published by the Free Software Foundation; either
> + version 2.1 of the License, or (at your option) any later version.
> +
> + The GNU C Library 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
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public
> + License along with the GNU C Library; if not, see
> + <http://www.gnu.org/licenses/>. */
> +
> +#include <stdio.h>
> +#include <stdlib.h>
> +#include <errno.h>
> +#include <string.h>
> +#include <sys/types.h>
> +#include <sys/ipc.h>
> +#include <sys/msg.h>
> +
> +static void do_prepare (void);
> +#define PREPARE(argc, argv) do_prepare ()
> +static int do_test (void);
> +#define TEST_FUNCTION do_test ()
> +
> +/* This defines the `main' function and some more. */
> +#include <test-skeleton.c>
> +
> +#define TEXTSIZE 32
> +struct msgbuf_t
> +{
> + long int type;
> + char text[TEXTSIZE];
> +};
> +
> +#define MSGTYPE 0x01020304
> +#define MSGDATA "0123456789"
> +
> +/* These are for the temporary file we generate. */
> +static char *name;
> +static int msqid;
> +
> +static void
> +remove_msq (void)
> +{
> + /* Enforce message queue removal in case o early test failure.
Trailing whitespace
> + Ignore error since the msgq maybe already being removed. */
> + msgctl (msqid, IPC_RMID, NULL);
> +}
> +
> +static void
> +do_prepare (void)
> +{
> + int fd = create_temp_file ("tst-sysvmsg.", &name);
> + if (fd == -1)
> + FAIL_EXIT1 ("cannot create temporary file (errno=%d)", errno);
> +}
> +
> +/* It is not an extensive test, but rather a functional one aimed to check
> + correct parameter passing on kernel. */
> +
> +#define MSGQ_MODE 0644
> +
> +static int
> +do_test (void)
> +{
> + atexit (remove_msq);
> +
> + key_t key = ftok (name, 'G');
> + if (key == -1)
> + FAIL_EXIT1 ("ftok failed");
> +
> + msqid = msgget (key, MSGQ_MODE | IPC_CREAT);
> + if (msqid == -1)
> + {
> + if (errno == ENOSYS)
> + FAIL_UNSUPPORTED ("msgget not supported");
> + FAIL_EXIT1 ("msgget failed (errno=%d)", errno);
> + }
> +
> + /* Get message queue kernel information and do some sanitiy checks. */
> + struct msqid_ds msginfo;
> + if (msgctl (msqid, IPC_STAT, &msginfo) == -1)
> + FAIL_EXIT1 ("msgctl with IPC_STAT failed (errno=%d)", errno);
> +
> + if (msginfo.msg_perm.__key != key)
> + FAIL_EXIT1 ("msgid_ds::msg_perm::key (%d) != %d",
> + (int) msginfo.msg_perm.__key, (int) key);
> + if (msginfo.msg_perm.mode != MSGQ_MODE)
> + FAIL_EXIT1 ("msgid_ds::msg_perm::mode (%o) != %o",
> + msginfo.msg_perm.mode, MSGQ_MODE);
> + if (msginfo.msg_qnum != 0)
> + FAIL_EXIT1 ("msgid_ds::msg_qnum (%lu) != 0",
> + (long unsigned) msginfo.msg_qnum);
> +
> + /* Check if lastest argument (IPC_NOWAIT) is correct handled. */
> + struct msgbuf_t msg2rcv = { 0 };
> + if (msgrcv (msqid, &msg2rcv, TEXTSIZE, MSGTYPE, IPC_NOWAIT) == -1
> + && errno != ENOMSG)
> + FAIL_EXIT1 ("msgrcv failed (errno=%d)", errno);
> +
> + struct msgbuf_t msg2snd = { MSGTYPE, MSGDATA };
> + if (msgsnd (msqid, &msg2snd, TEXTSIZE, 0) == -1)
> + FAIL_EXIT1 ("msgsnd failed (errno=%d)", errno);
> +
> + if (msgrcv (msqid, &msg2rcv, TEXTSIZE, MSGTYPE, 0) == -1)
> + FAIL_EXIT1 ("msgrcv failed (errno=%d)", errno);
> +
> + int ret = 0;
> + if (strncmp (msg2snd.text, msg2rcv.text, TEXTSIZE) != 0)
> + ret = 1;
> +
> + if (msgctl (msqid, IPC_RMID, NULL) == -1)
> + FAIL_EXIT1 ("msgctl failed");
> +
> + return ret;
> +}
> diff --git a/test-skeleton.c b/test-skeleton.c
> index 55841fb..f27e3da 100644
> --- a/test-skeleton.c
> +++ b/test-skeleton.c
> @@ -87,6 +87,8 @@ static const char *test_dir;
> exit (value); \
> })
>
> +#define FAIL_UNSUPPORTED(...) FAIL_EXIT(77, __VA_ARGS__)
> +
> #define FAIL_EXIT1(...) FAIL_EXIT(1, __VA_ARGS__)
>
> static void
> --
> 2.7.4
On 03/11/2016 15:08, Yury Norov wrote:
>> new file mode 100644
>> index 0000000..9393c83
>> --- /dev/null
>> +++ b/sysvipc/test-sysvmsg.c
>> @@ -0,0 +1,123 @@
>> +/* Basic tests for SYSV message queue functions.
>> + Copyright (C) 2016 Free Software Foundation, Inc.
>> + This file is part of the GNU C Library.
>> +
>> + The GNU C Library is free software; you can redistribute it and/or
>> + modify it under the terms of the GNU Lesser General Public
>> + License as published by the Free Software Foundation; either
>> + version 2.1 of the License, or (at your option) any later version.
>> +
>> + The GNU C Library 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
>> + Lesser General Public License for more details.
>> +
>> + You should have received a copy of the GNU Lesser General Public
>> + License along with the GNU C Library; if not, see
>> + <http://www.gnu.org/licenses/>. */
>> +
>> +#include <stdio.h>
>> +#include <stdlib.h>
>> +#include <errno.h>
>> +#include <string.h>
>> +#include <sys/types.h>
>> +#include <sys/ipc.h>
>> +#include <sys/msg.h>
>> +
>> +static void do_prepare (void);
>> +#define PREPARE(argc, argv) do_prepare ()
>> +static int do_test (void);
>> +#define TEST_FUNCTION do_test ()
>> +
>> +/* This defines the `main' function and some more. */
>> +#include <test-skeleton.c>
>> +
>> +#define TEXTSIZE 32
>> +struct msgbuf_t
>> +{
>> + long int type;
>> + char text[TEXTSIZE];
>> +};
>> +
>> +#define MSGTYPE 0x01020304
>> +#define MSGDATA "0123456789"
>> +
>> +/* These are for the temporary file we generate. */
>> +static char *name;
>> +static int msqid;
>> +
>> +static void
>> +remove_msq (void)
>> +{
>> + /* Enforce message queue removal in case o early test failure.
>
> Trailing whitespace
Ack, I fixed it on my local branch.
@@ -30,6 +30,8 @@ routines := ftok \
semop semget semctl semtimedop \
shmat shmdt shmget shmctl
+tests := test-sysvmsg
+
include ../Rules
CFLAGS-msgrcv.c = -fexceptions -fasynchronous-unwind-tables
new file mode 100644
@@ -0,0 +1,123 @@
+/* Basic tests for SYSV message queue functions.
+ Copyright (C) 2016 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/msg.h>
+
+static void do_prepare (void);
+#define PREPARE(argc, argv) do_prepare ()
+static int do_test (void);
+#define TEST_FUNCTION do_test ()
+
+/* This defines the `main' function and some more. */
+#include <test-skeleton.c>
+
+#define TEXTSIZE 32
+struct msgbuf_t
+{
+ long int type;
+ char text[TEXTSIZE];
+};
+
+#define MSGTYPE 0x01020304
+#define MSGDATA "0123456789"
+
+/* These are for the temporary file we generate. */
+static char *name;
+static int msqid;
+
+static void
+remove_msq (void)
+{
+ /* Enforce message queue removal in case o early test failure.
+ Ignore error since the msgq maybe already being removed. */
+ msgctl (msqid, IPC_RMID, NULL);
+}
+
+static void
+do_prepare (void)
+{
+ int fd = create_temp_file ("tst-sysvmsg.", &name);
+ if (fd == -1)
+ FAIL_EXIT1 ("cannot create temporary file (errno=%d)", errno);
+}
+
+/* It is not an extensive test, but rather a functional one aimed to check
+ correct parameter passing on kernel. */
+
+#define MSGQ_MODE 0644
+
+static int
+do_test (void)
+{
+ atexit (remove_msq);
+
+ key_t key = ftok (name, 'G');
+ if (key == -1)
+ FAIL_EXIT1 ("ftok failed");
+
+ msqid = msgget (key, MSGQ_MODE | IPC_CREAT);
+ if (msqid == -1)
+ {
+ if (errno == ENOSYS)
+ FAIL_UNSUPPORTED ("msgget not supported");
+ FAIL_EXIT1 ("msgget failed (errno=%d)", errno);
+ }
+
+ /* Get message queue kernel information and do some sanitiy checks. */
+ struct msqid_ds msginfo;
+ if (msgctl (msqid, IPC_STAT, &msginfo) == -1)
+ FAIL_EXIT1 ("msgctl with IPC_STAT failed (errno=%d)", errno);
+
+ if (msginfo.msg_perm.__key != key)
+ FAIL_EXIT1 ("msgid_ds::msg_perm::key (%d) != %d",
+ (int) msginfo.msg_perm.__key, (int) key);
+ if (msginfo.msg_perm.mode != MSGQ_MODE)
+ FAIL_EXIT1 ("msgid_ds::msg_perm::mode (%o) != %o",
+ msginfo.msg_perm.mode, MSGQ_MODE);
+ if (msginfo.msg_qnum != 0)
+ FAIL_EXIT1 ("msgid_ds::msg_qnum (%lu) != 0",
+ (long unsigned) msginfo.msg_qnum);
+
+ /* Check if lastest argument (IPC_NOWAIT) is correct handled. */
+ struct msgbuf_t msg2rcv = { 0 };
+ if (msgrcv (msqid, &msg2rcv, TEXTSIZE, MSGTYPE, IPC_NOWAIT) == -1
+ && errno != ENOMSG)
+ FAIL_EXIT1 ("msgrcv failed (errno=%d)", errno);
+
+ struct msgbuf_t msg2snd = { MSGTYPE, MSGDATA };
+ if (msgsnd (msqid, &msg2snd, TEXTSIZE, 0) == -1)
+ FAIL_EXIT1 ("msgsnd failed (errno=%d)", errno);
+
+ if (msgrcv (msqid, &msg2rcv, TEXTSIZE, MSGTYPE, 0) == -1)
+ FAIL_EXIT1 ("msgrcv failed (errno=%d)", errno);
+
+ int ret = 0;
+ if (strncmp (msg2snd.text, msg2rcv.text, TEXTSIZE) != 0)
+ ret = 1;
+
+ if (msgctl (msqid, IPC_RMID, NULL) == -1)
+ FAIL_EXIT1 ("msgctl failed");
+
+ return ret;
+}
@@ -87,6 +87,8 @@ static const char *test_dir;
exit (value); \
})
+#define FAIL_UNSUPPORTED(...) FAIL_EXIT(77, __VA_ARGS__)
+
#define FAIL_EXIT1(...) FAIL_EXIT(1, __VA_ARGS__)
static void