* [LTP] [PATCH 1/7] syscalls/clone01: Convert to new API
@ 2021-08-13 7:25 zhanglianjie
2021-08-25 12:43 ` Cyril Hrubis
0 siblings, 1 reply; 2+ messages in thread
From: zhanglianjie @ 2021-08-13 7:25 UTC (permalink / raw)
To: ltp
Signed-off-by: zhanglianjie <zhanglianjie@uniontech.com>
diff --git a/testcases/kernel/syscalls/clone/clone01.c b/testcases/kernel/syscalls/clone/clone01.c
index e490b4e77..69d293ad6 100644
--- a/testcases/kernel/syscalls/clone/clone01.c
+++ b/testcases/kernel/syscalls/clone/clone01.c
@@ -1,90 +1,54 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) Wipro Technologies Ltd, 2002. All Rights Reserved.
* Copyright (c) 2012 Wanlong Gao <gaowanlong@cn.fujitsu.com>
- *
- * 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; if not, write the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
*/
-/*
- * This is a test for the clone(2) system call.
- * It is intended to provide a limited exposure of the system call.
+/*\
+ * [Description]
+ * This is a test for the clone(2) system call.
+ * It is intended to provide a limited exposure of the system call.
*/
-#if defined UCLINUX && !__THROW
-/* workaround for libc bug */
-#define __THROW
-#endif
-
-#include <errno.h>
-#include <sched.h>
-#include <sys/wait.h>
-#include "test.h"
-#include "safe_macros.h"
+#include <stdlib.h>
+#include "tst_test.h"
#include "clone_platform.h"
-static void setup(void);
-static void cleanup(void);
-static int do_child();
+static void *child_stack;
-char *TCID = "clone01";
-int TST_TOTAL = 1;
+static int do_child(void *arg LTP_ATTRIBUTE_UNUSED)
+{
+ exit(0);
+}
-int main(int ac, char **av)
+static void verify_clone(void)
{
- void *child_stack;
int status, child_pid;
- tst_parse_opts(ac, av, NULL, NULL);
+ TST_EXP_POSITIVE(ltp_clone(SIGCHLD, do_child, NULL,
+ CHILD_STACK_SIZE, child_stack), "clone()");
- setup();
+ child_pid = SAFE_WAIT(&status);
- child_stack = malloc(CHILD_STACK_SIZE);
- if (child_stack == NULL)
- tst_brkm(TBROK, cleanup, "Cannot allocate stack for child");
-
- tst_count = 0;
-
- TEST(ltp_clone(SIGCHLD, do_child, NULL, CHILD_STACK_SIZE, child_stack));
- if (TEST_RETURN == -1)
- tst_resm(TFAIL | TTERRNO, "clone failed");
-
- child_pid = SAFE_WAIT(cleanup, &status);
-
- if (TEST_RETURN == child_pid)
- tst_resm(TPASS, "clone returned %ld", TEST_RETURN);
+ if (TST_RET == child_pid)
+ tst_res(TPASS, "clone returned %ld", TST_RET);
else
- tst_resm(TFAIL, "clone returned %ld, wait returned %d",
- TEST_RETURN, child_pid);
-
- free(child_stack);
-
- cleanup();
-
- tst_exit();
+ tst_res(TFAIL, "clone returned %ld, wait returned %d",
+ TST_RET, child_pid);
}
-static void setup(void)
-{
- tst_sig(FORK, DEF_HANDLER, cleanup);
- TEST_PAUSE;
+static void setup(void) {
+ child_stack = SAFE_MALLOC(CHILD_STACK_SIZE);
}
-static void cleanup(void)
-{
+static void cleanup(void) {
+ free(child_stack);
}
-static int do_child(void)
-{
- exit(0);
-}
+static struct tst_test test = {
+ .setup = setup,
+ .cleanup = cleanup,
+ .test_all = verify_clone,
+ .forks_child = 1,
+// .needs_tmpdir = 1,
+};
\ No newline at end of file
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [LTP] [PATCH 1/7] syscalls/clone01: Convert to new API
2021-08-13 7:25 [LTP] [PATCH 1/7] syscalls/clone01: Convert to new API zhanglianjie
@ 2021-08-25 12:43 ` Cyril Hrubis
0 siblings, 0 replies; 2+ messages in thread
From: Cyril Hrubis @ 2021-08-25 12:43 UTC (permalink / raw)
To: ltp
Hi!
> +/*\
> + * [Description]
> + * This is a test for the clone(2) system call.
> + * It is intended to provide a limited exposure of the system call.
We should write a better description than this, ideally outline what the
test really does with something as:
/*\
* [Description]
*
* Basic clone() test.
*
* Starts a child with clone() syscalls, child does exit(0) and parent waits on it.
*/
> */
>
> -#if defined UCLINUX && !__THROW
> -/* workaround for libc bug */
> -#define __THROW
> -#endif
> -
> -#include <errno.h>
> -#include <sched.h>
> -#include <sys/wait.h>
> -#include "test.h"
> -#include "safe_macros.h"
> +#include <stdlib.h>
> +#include "tst_test.h"
> #include "clone_platform.h"
>
> -static void setup(void);
> -static void cleanup(void);
> -static int do_child();
> +static void *child_stack;
>
> -char *TCID = "clone01";
> -int TST_TOTAL = 1;
> +static int do_child(void *arg LTP_ATTRIBUTE_UNUSED)
> +{
> + exit(0);
> +}
>
> -int main(int ac, char **av)
> +static void verify_clone(void)
> {
> - void *child_stack;
> int status, child_pid;
>
> - tst_parse_opts(ac, av, NULL, NULL);
> + TST_EXP_POSITIVE(ltp_clone(SIGCHLD, do_child, NULL,
> + CHILD_STACK_SIZE, child_stack), "clone()");
>
> - setup();
> + child_pid = SAFE_WAIT(&status);
>
> - child_stack = malloc(CHILD_STACK_SIZE);
> - if (child_stack == NULL)
> - tst_brkm(TBROK, cleanup, "Cannot allocate stack for child");
> -
> - tst_count = 0;
> -
> - TEST(ltp_clone(SIGCHLD, do_child, NULL, CHILD_STACK_SIZE, child_stack));
> - if (TEST_RETURN == -1)
> - tst_resm(TFAIL | TTERRNO, "clone failed");
> -
> - child_pid = SAFE_WAIT(cleanup, &status);
> -
> - if (TEST_RETURN == child_pid)
> - tst_resm(TPASS, "clone returned %ld", TEST_RETURN);
> + if (TST_RET == child_pid)
> + tst_res(TPASS, "clone returned %ld", TST_RET);
> else
> - tst_resm(TFAIL, "clone returned %ld, wait returned %d",
> - TEST_RETURN, child_pid);
> -
> - free(child_stack);
> -
> - cleanup();
> -
> - tst_exit();
> + tst_res(TFAIL, "clone returned %ld, wait returned %d",
> + TST_RET, child_pid);
I guess that we should as well check that the test did exit with zero as
well with something as:
if (WIFEXITTED(status) && WEXITSTATUS(status) == 0)
tst_res(TPASS, "Child exitted with 0");
else
tst_res(TFAIL, "Child %s", tst_strstatus(status));
> }
>
> -static void setup(void)
> -{
> - tst_sig(FORK, DEF_HANDLER, cleanup);
> - TEST_PAUSE;
> +static void setup(void) {
> + child_stack = SAFE_MALLOC(CHILD_STACK_SIZE);
> }
>
> -static void cleanup(void)
> -{
> +static void cleanup(void) {
> + free(child_stack);
> }
These two functions violate LKML coding style, the opening brace have to
be on a seprate line.
You can easily check for these with the checkpatch.pl script as
described in:
https://github.com/linux-test-project/ltp/wiki/Test-Writing-Guidelines#6-test-contribution-checklist
> -static int do_child(void)
> -{
> - exit(0);
> -}
> +static struct tst_test test = {
> + .setup = setup,
> + .cleanup = cleanup,
> + .test_all = verify_clone,
> + .forks_child = 1,
> +// .needs_tmpdir = 1,
If it's not needed just delete the line, no commented code please.
> +};
> \ No newline at end of file
> --
> 2.20.1
>
>
>
>
> --
> Mailing list info: https://lists.linux.it/listinfo/ltp
--
Cyril Hrubis
chrubis@suse.cz
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-08-25 12:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-13 7:25 [LTP] [PATCH 1/7] syscalls/clone01: Convert to new API zhanglianjie
2021-08-25 12:43 ` Cyril Hrubis
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.