* [LTP] [PATCH] [2/4] syscalls/chroot02: Convert to new API
@ 2021-08-05 7:34 zhanglianjie
2021-08-05 9:52 ` Cyril Hrubis
0 siblings, 1 reply; 2+ messages in thread
From: zhanglianjie @ 2021-08-05 7:34 UTC (permalink / raw)
To: ltp
Signed-off-by: zhanglianjie <zhanglianjie@uniontech.com>
diff --git a/testcases/kernel/syscalls/chroot/chroot02.c b/testcases/kernel/syscalls/chroot/chroot02.c
index e483ca4b5..ac8bff304 100644
--- a/testcases/kernel/syscalls/chroot/chroot02.c
+++ b/testcases/kernel/syscalls/chroot/chroot02.c
@@ -1,148 +1,78 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
- *
* Copyright (c) International Business Machines Corp., 2001
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-/*
- * NAME
- * chroot02.c
- *
- * DESCRIPTION
- * Test functionality of chroot(2)
- *
- * ALGORITHM
- * Change root directory and then stat a file.
- *
- * USAGE: <for command-line>
- * chroot02 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- * where, -c n : Run n copies concurrently.
- * -f : Turn off functionality Testing.
- * -i n : Execute test n times.
- * -I x : Execute test for x seconds.
- * -P x : Pause for x seconds between iterations.
- * -t : Turn on syscall timing.
+/*\
+ * [DESCRIPTION]
*
- * HISTORY
- * 07/2001 Ported by Wayne Boyer
- * 04/2003 Modified by Manoj Iyer - manjo@mail.utexas.edu
- * Change testcase to chroot into a temporary directory
- * and stat() a known file.
- *
- * RESTRICTIONS
- * NONE
+ * Change root directory and then stat a file.
*/
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
+#include <stdio.h>
+#include <stdlib.h>
#include <errno.h>
-#include "test.h"
+#include <sys/stat.h>
#include <fcntl.h>
-
-char *TCID = "chroot02";
-int TST_TOTAL = 1;
-int fileHandle = 0;
+#include "tst_test.h"
#define TMP_FILENAME "chroot02_testfile"
+int fileHandle = 0;
struct stat buf;
-void setup(void);
-void cleanup(void);
-
-int main(int ac, char **av)
+static void verify_chroot(void)
{
- int lc;
int pid, status, retval;
- tst_parse_opts(ac, av, NULL, NULL);
-
- setup();
-
- /* Check for looping state if -i option is given */
- for (lc = 0; TEST_LOOPING(lc); lc++) {
- /* reset tst_count in case we are looping */
- tst_count = 0;
-
- if ((pid = FORK_OR_VFORK()) == -1) {
- tst_brkm(TBROK, cleanup, "Could not fork");
- }
+ if ((pid = SAFE_FORK()) == -1) {
+ tst_brk(TBROK, "Could not fork");
+ }
- if (pid == 0) {
- retval = 0;
+ if (pid == 0) {
+ retval = 0;
- if (chroot(tst_get_tmpdir()) == -1) {
- perror("chroot failed");
+ if (chroot(tst_get_tmpdir()) == -1) {
+ perror("chroot failed");
+ retval = 1;
+ } else {
+ if (stat("/" TMP_FILENAME, &buf) == -1) {
retval = 1;
- } else {
- if (stat("/" TMP_FILENAME, &buf) == -1) {
- retval = 1;
- perror("stat failed");
- }
+ perror("stat failed");
}
-
- exit(retval);
}
- /* parent */
- wait(&status);
- /* make sure the child returned a good exit status */
- if (WIFSIGNALED(status) ||
- (WIFEXITED(status) && WEXITSTATUS(status) != 0))
- tst_resm(TFAIL, "chroot functionality incorrect");
- else
- tst_resm(TPASS, "chroot functionality correct");
+ exit(retval);
}
- cleanup();
- tst_exit();
+ /* parent */
+ SAFE_WAIT(&status);
+ /* make sure the child returned a good exit status */
+ if (WIFSIGNALED(status) ||
+ (WIFEXITED(status) && WEXITSTATUS(status) != 0))
+ tst_res(TFAIL, "chroot functionality incorrect");
+ else
+ tst_res(TPASS, "chroot functionality correct");
}
-/*
- * setup() - performs all ONE TIME setup for this test.
- */
-void setup(void)
+static void setup(void)
{
- tst_require_root();
-
- tst_tmpdir();
if ((fileHandle = creat(TMP_FILENAME, 0777)) == -1)
- tst_brkm(TBROK, cleanup, "failed to create temporary file "
- TMP_FILENAME);
+ tst_brk(TBROK, "failed to create temporary file "
+ TMP_FILENAME);
if (stat(TMP_FILENAME, &buf) != 0)
- tst_brkm(TBROK, cleanup, TMP_FILENAME " does not exist");
-
- tst_sig(FORK, DEF_HANDLER, cleanup);
-
- TEST_PAUSE;
+ tst_brk(TBROK, TMP_FILENAME " does not exist");
}
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- * completion or premature exit.
- */
-void cleanup(void)
+static void cleanup(void)
{
- /*
- * print timing stats if that option was specified.
- * print errno log if that option was specified.
- */
close(fileHandle);
-
- tst_rmdir();
-
}
+
+static struct tst_test test = {
+ .cleanup = cleanup,
+ .setup = setup,
+ .test_all = verify_chroot,
+ .needs_root = 1,
+ .forks_child = 1,
+ .needs_tmpdir = 1,
+};
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [LTP] [PATCH] [2/4] syscalls/chroot02: Convert to new API
2021-08-05 7:34 [LTP] [PATCH] [2/4] syscalls/chroot02: Convert to new API zhanglianjie
@ 2021-08-05 9:52 ` Cyril Hrubis
0 siblings, 0 replies; 2+ messages in thread
From: Cyril Hrubis @ 2021-08-05 9:52 UTC (permalink / raw)
To: ltp
Hi!
> +/*\
> + * [DESCRIPTION]
> *
> - * HISTORY
> - * 07/2001 Ported by Wayne Boyer
> - * 04/2003 Modified by Manoj Iyer - manjo@mail.utexas.edu
We usually move this part just after the IBM copyright.
> - * Change testcase to chroot into a temporary directory
> - * and stat() a known file.
> - *
> - * RESTRICTIONS
> - * NONE
> + * Change root directory and then stat a file.
> */
> -
> -#include <sys/types.h>
> -#include <sys/stat.h>
> -#include <sys/wait.h>
> +#include <stdio.h>
> +#include <stdlib.h>
> #include <errno.h>
> -#include "test.h"
> +#include <sys/stat.h>
> #include <fcntl.h>
> -
> -char *TCID = "chroot02";
> -int TST_TOTAL = 1;
> -int fileHandle = 0;
> +#include "tst_test.h"
>
> #define TMP_FILENAME "chroot02_testfile"
> +int fileHandle = 0;
Uff, just use fd as we do everywhere else, also it should be static and
moreover global variables are already initialized to 0 so this really
should be just:
static int fd;
> struct stat buf;
static as well.
> -void setup(void);
> -void cleanup(void);
> -
> -int main(int ac, char **av)
> +static void verify_chroot(void)
> {
> - int lc;
> int pid, status, retval;
>
> - tst_parse_opts(ac, av, NULL, NULL);
> -
> - setup();
> -
> - /* Check for looping state if -i option is given */
> - for (lc = 0; TEST_LOOPING(lc); lc++) {
> - /* reset tst_count in case we are looping */
> - tst_count = 0;
> -
> - if ((pid = FORK_OR_VFORK()) == -1) {
> - tst_brkm(TBROK, cleanup, "Could not fork");
> - }
> + if ((pid = SAFE_FORK()) == -1) {
> + tst_brk(TBROK, "Could not fork");
> + }
Again SAFE_ macros cannot fail.
> - if (pid == 0) {
> - retval = 0;
> + if (pid == 0) {
> + retval = 0;
>
> - if (chroot(tst_get_tmpdir()) == -1) {
> - perror("chroot failed");
> + if (chroot(tst_get_tmpdir()) == -1) {
> + perror("chroot failed");
> + retval = 1;
This should be TST_EXP_PASS().
> + } else {
> + if (stat("/" TMP_FILENAME, &buf) == -1) {
> retval = 1;
> - } else {
> - if (stat("/" TMP_FILENAME, &buf) == -1) {
> - retval = 1;
> - perror("stat failed");
> - }
> + perror("stat failed");
> }
> -
> - exit(retval);
> }
>
> - /* parent */
> - wait(&status);
> - /* make sure the child returned a good exit status */
> - if (WIFSIGNALED(status) ||
> - (WIFEXITED(status) && WEXITSTATUS(status) != 0))
> - tst_resm(TFAIL, "chroot functionality incorrect");
> - else
> - tst_resm(TPASS, "chroot functionality correct");
> + exit(retval);
> }
>
> - cleanup();
> - tst_exit();
> + /* parent */
> + SAFE_WAIT(&status);
> + /* make sure the child returned a good exit status */
> + if (WIFSIGNALED(status) ||
> + (WIFEXITED(status) && WEXITSTATUS(status) != 0))
> + tst_res(TFAIL, "chroot functionality incorrect");
> + else
> + tst_res(TPASS, "chroot functionality correct");
New library testcases can call tst_res() from a child processes so there
is no reason to propagate the test result via process exit value. The
child should use tst_res() instead of the perror() calls and the parent
should just call tst_reap_children().
> }
>
> -/*
> - * setup() - performs all ONE TIME setup for this test.
> - */
> -void setup(void)
> +static void setup(void)
> {
> - tst_require_root();
> -
> - tst_tmpdir();
> if ((fileHandle = creat(TMP_FILENAME, 0777)) == -1)
> - tst_brkm(TBROK, cleanup, "failed to create temporary file "
> - TMP_FILENAME);
> + tst_brk(TBROK, "failed to create temporary file "
> + TMP_FILENAME);
> if (stat(TMP_FILENAME, &buf) != 0)
> - tst_brkm(TBROK, cleanup, TMP_FILENAME " does not exist");
> -
> - tst_sig(FORK, DEF_HANDLER, cleanup);
> -
> - TEST_PAUSE;
> + tst_brk(TBROK, TMP_FILENAME " does not exist");
We do have SAFE_CREAT() and SAFE_STAT() please use them here as well.
> }
>
> -/*
> - * cleanup() - performs all ONE TIME cleanup for this test at
> - * completion or premature exit.
> - */
> -void cleanup(void)
> +static void cleanup(void)
> {
> - /*
> - * print timing stats if that option was specified.
> - * print errno log if that option was specified.
> - */
> close(fileHandle);
You should use SAFE_CLOSE() here as well.
> -
> - tst_rmdir();
> -
> }
> +
> +static struct tst_test test = {
> + .cleanup = cleanup,
> + .setup = setup,
> + .test_all = verify_chroot,
> + .needs_root = 1,
> + .forks_child = 1,
> + .needs_tmpdir = 1,
> +};
> --
> 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-05 9:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-05 7:34 [LTP] [PATCH] [2/4] syscalls/chroot02: Convert to new API zhanglianjie
2021-08-05 9:52 ` 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.