Hi!
> Add new tests for msgctl(2):
> IPC_INFO
> MSG_INFO
> MSG_STAT
>
> Signed-off-by: Zeng Linggang <[email protected]>
> ---
> runtest/syscalls | 1 +
> runtest/syscalls-ipc | 1 +
> testcases/kernel/syscalls/.gitignore | 1 +
> testcases/kernel/syscalls/ipc/msgctl/msgctl12.c | 116
> ++++++++++++++++++++++++
> 4 files changed, 119 insertions(+)
> create mode 100644 testcases/kernel/syscalls/ipc/msgctl/msgctl12.c
>
> diff --git a/runtest/syscalls b/runtest/syscalls
> index c5bbe8f..3254e4d 100644
> --- a/runtest/syscalls
> +++ b/runtest/syscalls
> @@ -627,6 +627,7 @@ msgctl08 msgctl08
> msgctl09 msgctl09
> msgctl10 msgctl10
> msgctl11 msgctl11
> +msgctl12 msgctl12
>
> msgget01 msgget01
> msgget02 msgget02
> diff --git a/runtest/syscalls-ipc b/runtest/syscalls-ipc
> index f57a96e..415357b 100644
> --- a/runtest/syscalls-ipc
> +++ b/runtest/syscalls-ipc
> @@ -9,6 +9,7 @@ msgctl08 msgctl08
> msgctl09 msgctl09
> msgctl10 msgctl10
> msgctl11 msgctl11
> +msgctl12 msgctl12
>
> msgget01 msgget01
> msgget02 msgget02
> diff --git a/testcases/kernel/syscalls/.gitignore
> b/testcases/kernel/syscalls/.gitignore
> index bbefb25..7be0424 100644
> --- a/testcases/kernel/syscalls/.gitignore
> +++ b/testcases/kernel/syscalls/.gitignore
> @@ -373,6 +373,7 @@
> /ipc/msgctl/msgctl09
> /ipc/msgctl/msgctl10
> /ipc/msgctl/msgctl11
> +/ipc/msgctl/msgctl12
> /ipc/msgget/msgget01
> /ipc/msgget/msgget02
> /ipc/msgget/msgget03
> diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl12.c
> b/testcases/kernel/syscalls/ipc/msgctl/msgctl12.c
> new file mode 100644
> index 0000000..5dfa552
> --- /dev/null
> +++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl12.c
> @@ -0,0 +1,116 @@
> +/*
> + * Copyright (c) 2013 Fujitsu Ltd.
> + * Author: Zeng Linggang <[email protected]>
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms of version 2 of the GNU General Public License as
> + * published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it would be useful, but
> + * WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
> + *
> + * You should have received a copy of the GNU General Public License along
> + * with this program.
> + */
> +
> +#define _GNU_SOURCE
> +#include <sys/types.h>
> +#include <sys/ipc.h>
> +#include <sys/msg.h>
> +#include <errno.h>
> +
> +#include "test.h"
> +#include "usctest.h"
> +#include "ipcmsg.h"
> +
> +static int msg_q;
> +static int index_q;
> +static struct msqid_ds qs_buf;
> +
> +static void setup3(void);
> +
> +static struct test_case_t {
> + int *queue_id;
> + int ipc_cmd;
> + char *name;
> + void (*setup)(void);
> +} test_cases[] = {
> + {&msg_q, IPC_INFO, "IPC_INFO", NULL},
> + {&msg_q, MSG_INFO, "MSG_INFO", NULL},
These two types IPC_INFO and MSG_INFO take struct msginfo and not
msgid_ds. We should add a void pointer to the test case structure and
set it to point to strcut msginfo for these two and to qs_buf for the
MSG_STAT.
> + {&index_q, MSG_STAT, "MSG_STAT", setup3},
> +};
> +
> +char *TCID = "acct12";
> +int TST_TOTAL = ARRAY_SIZE(test_cases);
> +
> +int main(int argc, char *argv[])
> +{
> + int lc;
> + char *msg;
> + int i;
> +
> + msg = parse_opts(argc, argv, NULL, NULL);
> + if (msg != NULL)
> + tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
> +
> + setup();
> +
> + for (lc = 0; TEST_LOOPING(lc); lc++) {
> +
> + tst_count = 0;
> +
> + for (i = 0; i < TST_TOTAL; i++) {
> +
> + if (test_cases[i].setup != NULL)
> + test_cases[i].setup();
> +
> + TEST(msgctl(*test_cases[i].queue_id,
> + test_cases[i].ipc_cmd, &qs_buf));
> +
> + if (TEST_RETURN == -1) {
> + tst_resm(TFAIL,
> + "msgctl() test %s failed with errno: "
> + "%d", test_cases[i].name, TEST_ERRNO);
> + } else {
> + tst_resm(TPASS, "msgctl() test %s succeeded",
> + test_cases[i].name);
> + }
> + }
> + }
> +
> + cleanup();
> +
> + tst_exit();
> +}
> +
> +void setup(void)
> +{
> + tst_sig(NOFORK, DEF_HANDLER, cleanup);
> +
> + TEST_PAUSE;
> +
> + tst_tmpdir();
You don't have to create the temp directory, the test does not work with
files.
> + msgkey = getipckey();
> +
> + msg_q = msgget(msgkey, IPC_CREAT | IPC_EXCL | MSG_RW);
You can use IPC_PRIVATE instead of the key here (and drop the CREAT and
EXCL flags that are implied by IPC_PRIVATE).
> + if (msg_q == -1)
> + tst_brkm(TBROK, cleanup, "Can't create message queue");
> +}
> +
> +static void setup3(void)
> +{
> + index_q = msgctl(msg_q, IPC_INFO, &qs_buf);
> + if (index_q < 0)
> + tst_brkm(TBROK, cleanup, "Can't create message queue");
The last parameter shoud be pointer to strcut msginfo, not msgid_ds.
> +}
> +
> +void cleanup(void)
> +{
> + rm_queue(msg_q);
> +
> + tst_rmdir();
> +
> + TEST_CLEANUP;
> +}
--
Cyril Hrubis
[email protected]
------------------------------------------------------------------------------
Managing the Performance of Cloud-Based Applications
Take advantage of what the Cloud has to offer - Avoid Common Pitfalls.
Read the Whitepaper.
http://pubads.g.doubleclick.net/gampad/clk?id=121051231&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
