* [LTP] [PATCH v6 1/5] syscalls/dup2/dup201: Convert to new API
2021-09-20 3:37 [LTP] [PATCH v6 0/5] Convert syscalls/dup2/dup2{01...05} to new API QI Fuli
@ 2021-09-20 3:37 ` QI Fuli
2021-09-20 3:37 ` [LTP] [PATCH v6 2/5] syscalls/dup2/dup202: " QI Fuli
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: QI Fuli @ 2021-09-20 3:37 UTC (permalink / raw)
To: ltp; +Cc: QI Fuli
From: QI Fuli <qi.fuli@fujitsu.com>
Signed-off-by: QI Fuli <qi.fuli@fujitsu.com>
---
testcases/kernel/syscalls/dup2/dup201.c | 174 +++++-------------------
1 file changed, 33 insertions(+), 141 deletions(-)
diff --git a/testcases/kernel/syscalls/dup2/dup201.c b/testcases/kernel/syscalls/dup2/dup201.c
index 4fa34466a..d851eea78 100644
--- a/testcases/kernel/syscalls/dup2/dup201.c
+++ b/testcases/kernel/syscalls/dup2/dup201.c
@@ -1,163 +1,55 @@
+// 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
+ * Copyright (c) International Business Machines Corp., 2001
+ * 07/2001 Ported by Wayne Boyer
+ * 01/2002 Removed EMFILE test - Paul Larson
*/
-
-/*
- * NAME
- * dup201.c
- *
- * DESCRIPTION
- * Negative tests for dup2() with bad fd (EBADF)
- *
- * ALGORITHM
- * Setup:
- * a. Setup signal handling.
- * b. Pause for SIGUSR1 if option specified.
- *
- * Test:
- * a. Loop if the proper options are given.
- * b. Loop through the test cases
- * c. Execute dup2() system call
- * d. Check return code, if system call failed (return=-1), test
- * for EBADF.
- *
- * Cleanup:
- * a. Print errno log and/or timing stats if options given
+/*\
+ * [Description]
*
- * USAGE: <for command-line>
- * dup201 [-c n] [-e] [-i n] [-I x] [-P x] [-t]
- * where, -c n : Run n copies concurrently.
- * -e : Turn on errno logging.
- * -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.
+ * Negative tests for dup2() with bad fd (EBADF).
*
- * HISTORY
- * 07/2001 Ported by Wayne Boyer
- * 01/2002 Removed EMFILE test - Paul Larson
+ * - First fd argument is less than 0
+ * - First fd argument is getdtablesize()
+ * - Second fd argument is less than 0
+ * - Second fd argument is getdtablesize()
*
- * RESTRICTIONS
- * NONE
*/
-#include <sys/types.h>
-#include <fcntl.h>
#include <errno.h>
-#include <sys/time.h>
-#include <sys/resource.h>
#include <unistd.h>
-#include <signal.h>
-#include "test.h"
+#include "tst_test.h"
-void setup(void);
-void cleanup(void);
+static int maxfd, mystdout;
+static int goodfd = 5;
+static int badfd = -1;
-char *TCID = "dup201";
-int TST_TOTAL = 4;
-
-int maxfd;
-int goodfd = 5;
-int badfd = -1;
-int mystdout = 0;
-
-struct test_case_t {
+static struct tcase {
int *ofd;
int *nfd;
- int error;
- void (*setupfunc) ();
-} TC[] = {
- /* First fd argument is less than 0 - EBADF */
- {&badfd, &goodfd, EBADF, NULL},
- /* First fd argument is getdtablesize() - EBADF */
- {&maxfd, &goodfd, EBADF, NULL},
- /* Second fd argument is less than 0 - EBADF */
- {&mystdout, &badfd, EBADF, NULL},
- /* Second fd argument is getdtablesize() - EBADF */
- {&mystdout, &maxfd, EBADF, NULL},
+} tcases[] = {
+ {&badfd, &goodfd},
+ {&maxfd, &goodfd},
+ {&mystdout, &badfd},
+ {&mystdout, &maxfd},
};
-int main(int ac, char **av)
+static void setup(void)
{
- int lc;
- int i;
-
- tst_parse_opts(ac, av, NULL, NULL);
-
- setup();
-
- for (lc = 0; TEST_LOOPING(lc); lc++) {
-
- tst_count = 0;
-
- /* loop through the test cases */
-
- for (i = 0; i < TST_TOTAL; i++) {
-
- /* call the test case setup routine if necessary */
- if (TC[i].setupfunc != NULL)
- (*TC[i].setupfunc) ();
-
- TEST(dup2(*TC[i].ofd, *TC[i].nfd));
-
- if (TEST_RETURN != -1) {
- tst_resm(TFAIL, "call succeeded unexpectedly");
- continue;
- }
-
- if (TEST_ERRNO == TC[i].error) {
- tst_resm(TPASS,
- "failed as expected - errno = %d : %s",
- TEST_ERRNO, strerror(TEST_ERRNO));
- } else {
- tst_resm(TFAIL | TTERRNO,
- "failed unexpectedly; "
- "expected %d: %s", TC[i].error,
- strerror(TC[i].error));
- }
- }
- }
- cleanup();
-
- tst_exit();
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- */
-void setup(void)
-{
-
- tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
- TEST_PAUSE;
-
- tst_tmpdir();
-
/* get some test specific values */
maxfd = getdtablesize();
}
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- * completion or premature exit.
- */
-void cleanup(void)
+static void run(unsigned int i)
{
- tst_rmdir();
+ struct tcase *tc = tcases + i;
+
+ TST_EXP_FAIL2(dup2(*tc->ofd, *tc->nfd), EBADF,
+ "dup2(%d, %d)", *tc->ofd, *tc->nfd);
}
+
+static struct tst_test test = {
+ .tcnt = ARRAY_SIZE(tcases),
+ .test = run,
+ .setup = setup,
+};
--
2.31.1
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply related [flat|nested] 7+ messages in thread* [LTP] [PATCH v6 2/5] syscalls/dup2/dup202: Convert to new API
2021-09-20 3:37 [LTP] [PATCH v6 0/5] Convert syscalls/dup2/dup2{01...05} to new API QI Fuli
2021-09-20 3:37 ` [LTP] [PATCH v6 1/5] syscalls/dup2/dup201: Convert " QI Fuli
@ 2021-09-20 3:37 ` QI Fuli
2021-09-20 3:37 ` [LTP] [PATCH v6 3/5] syscalls/dup2/dup203: " QI Fuli
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: QI Fuli @ 2021-09-20 3:37 UTC (permalink / raw)
To: ltp; +Cc: QI Fuli
From: QI Fuli <qi.fuli@fujitsu.com>
Signed-off-by: QI Fuli <qi.fuli@fujitsu.com>
---
testcases/kernel/syscalls/dup2/dup202.c | 196 +++++++-----------------
1 file changed, 58 insertions(+), 138 deletions(-)
diff --git a/testcases/kernel/syscalls/dup2/dup202.c b/testcases/kernel/syscalls/dup2/dup202.c
index c87769fa9..feba0469a 100644
--- a/testcases/kernel/syscalls/dup2/dup202.c
+++ b/testcases/kernel/syscalls/dup2/dup202.c
@@ -1,167 +1,87 @@
+// 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
+ * Copyright (c) International Business Machines Corp., 2001
+ * 07/2001 Ported by Wayne Boyer
*/
-/*
- * NAME
- * dup202.c
+/*\
+ * [Description]
*
- * DESCRIPTION
- * Is the access mode the same for both file descriptors?
- * 0: read only ? "0444"
- * 1: write only ? "0222"
- * 2: read/write ? "0666"
+ * Test whether the access mode are the same for both file descriptors.
*
- * ALGORITHM
- * Creat a file with each access mode; dup each file descriptor;
- * stat each file descriptor and compare modes of each pair
- *
- * USAGE: <for command-line>
- * dup202 [-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.
- *
- * HISTORY
- * 07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- * None
+ * - 0: read only ? "0444"
+ * - 1: write only ? "0222"
+ * - 2: read/write ? "0666"
*/
-#include <sys/types.h>
-#include <sys/stat.h>
#include <errno.h>
-#include <fcntl.h>
#include <stdio.h>
-#include "test.h"
-#include "safe_macros.h"
-
-char *TCID = "dup202";
-int TST_TOTAL = 3;
-
-void setup(void);
-void cleanup(void);
+#include <unistd.h>
+#include "tst_test.h"
+#include "tst_safe_macros.h"
-char testfile[40];
-int fail;
-int newfd;
+static char testfile[40];
+static int ofd = -1, nfd = -1;
/* set these to a known index into our local file descriptor table */
-int duprdo = 10, dupwro = 20, duprdwr = 30;
+static int duprdo = 10, dupwro = 20, duprdwr = 30;
-struct test_case_t {
+static struct tcase {
int *nfd;
mode_t mode;
-} TC[] = {
- /* The first test creat(es) a file with mode 0444 */
- {
- &duprdo, (S_IRUSR | S_IRGRP | S_IROTH)},
- /* The second test creat(es) a file with mode 0222 */
- {
- &dupwro, (S_IWUSR | S_IWGRP | S_IWOTH)},
- /* The third test creat(es) a file with mode 0666 */
- {
- &duprdwr,
- (S_IRUSR | S_IRGRP | S_IROTH | S_IWUSR | S_IWGRP | S_IWOTH)}
+} tcases[]= {
+ {&duprdo, (S_IRUSR | S_IRGRP | S_IROTH)},
+ {&dupwro, (S_IWUSR | S_IWGRP | S_IWOTH)},
+ {&duprdwr, (S_IRUSR | S_IRGRP | S_IROTH | S_IWUSR | S_IWGRP | S_IWOTH)},
};
-int main(int ac, char **av)
+static void setup(void)
{
- int lc;
- int i, ofd;
- struct stat oldbuf, newbuf;
-
- tst_parse_opts(ac, av, NULL, NULL);
-
- setup();
-
- for (lc = 0; TEST_LOOPING(lc); lc++) {
-
- tst_count = 0;
-
- /* loop through the test cases */
- for (i = 0; i < TST_TOTAL; i++) {
-
- if ((ofd = creat(testfile, TC[i].mode)) == -1)
- tst_brkm(TBROK | TERRNO, cleanup,
- "creat failed");
-
- TEST(dup2(ofd, *TC[i].nfd));
-
- if (TEST_RETURN == -1) {
- tst_resm(TFAIL | TTERRNO,
- "call failed unexpectedly");
- continue;
- }
-
- /* stat the original file */
- SAFE_FSTAT(cleanup, ofd, &oldbuf);
-
- /* stat the duped file */
- SAFE_FSTAT(cleanup, *TC[i].nfd, &newbuf);
-
- if (oldbuf.st_mode != newbuf.st_mode)
- tst_resm(TFAIL, "original and dup "
- "modes do not match");
- else
- tst_resm(TPASS, "fstat shows new and "
- "old modes are the same");
-
- /* remove the file so that we can use it again */
- if (close(*TC[i].nfd) == -1)
- perror("close failed");
- if (close(ofd) == -1)
- perror("close failed");
- if (unlink(testfile) == -1)
- perror("unlink failed");
- }
- }
+ umask(0);
+ sprintf(testfile, "dup202.%d", getpid());
+}
- cleanup();
- tst_exit();
+static void cleanup(void)
+{
+ close(ofd);
+ close(nfd);
}
-/*
- * setup() - performs all ONE TIME setup for this test.
- */
-void setup(void)
+static void run(unsigned int i)
{
+ struct stat oldbuf, newbuf;
+ struct tcase *tc = tcases + i;
- tst_sig(NOFORK, DEF_HANDLER, cleanup);
+ ofd = SAFE_CREAT(testfile, tc->mode);
+ nfd = *tc->nfd;
- TEST_PAUSE;
+ TEST(dup2(ofd, nfd));
+ if (TST_RET == -1) {
+ tst_res(TFAIL | TTERRNO, "call failed unexpectedly");
+ goto free;
+ }
- tst_tmpdir();
+ SAFE_FSTAT(ofd, &oldbuf);
- (void)umask(0);
+ SAFE_FSTAT(nfd, &newbuf);
- sprintf(testfile, "dup202.%d", getpid());
-}
+ if (oldbuf.st_mode != newbuf.st_mode)
+ tst_res(TFAIL, "original(%o) and duped(%o) are not same mode",
+ oldbuf.st_mode, newbuf.st_mode);
+ else
+ tst_res(TPASS, "original(%o) and duped(%o) are the same mode",
+ oldbuf.st_mode, newbuf.st_mode);
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- * completion or premature exit.
- */
-void cleanup(void)
-{
- tst_rmdir();
+ SAFE_CLOSE(nfd);
+free:
+ SAFE_CLOSE(ofd);
+ SAFE_UNLINK(testfile);
}
+
+static struct tst_test test = {
+ .needs_tmpdir = 1,
+ .tcnt = ARRAY_SIZE(tcases),
+ .test = run,
+ .setup = setup,
+ .cleanup = cleanup,
+};
--
2.31.1
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply related [flat|nested] 7+ messages in thread* [LTP] [PATCH v6 3/5] syscalls/dup2/dup203: Convert to new API
2021-09-20 3:37 [LTP] [PATCH v6 0/5] Convert syscalls/dup2/dup2{01...05} to new API QI Fuli
2021-09-20 3:37 ` [LTP] [PATCH v6 1/5] syscalls/dup2/dup201: Convert " QI Fuli
2021-09-20 3:37 ` [LTP] [PATCH v6 2/5] syscalls/dup2/dup202: " QI Fuli
@ 2021-09-20 3:37 ` QI Fuli
2021-09-20 3:37 ` [LTP] [PATCH v6 4/5] syscalls/dup2/dup204: " QI Fuli
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: QI Fuli @ 2021-09-20 3:37 UTC (permalink / raw)
To: ltp; +Cc: QI Fuli
From: QI Fuli <qi.fuli@fujitsu.com>
Signed-off-by: QI Fuli <qi.fuli@fujitsu.com>
---
testcases/kernel/syscalls/dup2/dup203.c | 265 ++++++++----------------
1 file changed, 83 insertions(+), 182 deletions(-)
diff --git a/testcases/kernel/syscalls/dup2/dup203.c b/testcases/kernel/syscalls/dup2/dup203.c
index e6f281adf..d2f54304d 100644
--- a/testcases/kernel/syscalls/dup2/dup203.c
+++ b/testcases/kernel/syscalls/dup2/dup203.c
@@ -1,208 +1,109 @@
+// 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
+ * Copyright (c) International Business Machines Corp., 2001
+ * 07/2001 Ported by Wayne Boyer
*/
-/*
- * NAME
- * dup203.c
+/*\
+ * [Description]
*
- * DESCRIPTION
- * Testcase to check the basic functionality of dup2().
+ * Testcase to check the basic functionality of dup2().
*
- * ALGORITHM
- * 1. Attempt to dup2() on an open file descriptor.
- * 2. Attempt to dup2() on a close file descriptor.
- *
- * USAGE: <for command-line>
- * dup203 [-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.
- *
- * HISTORY
- * 07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- * NONE
+ * - Attempt to dup2() on an open file descriptor.
+ * - Attempt to dup2() on a close file descriptor.
*/
-#include <fcntl.h>
-#include <sys/param.h>
#include <errno.h>
-#include <string.h>
-#include "test.h"
-#include "safe_macros.h"
-
-void setup(void);
-void cleanup(void);
-
-char *TCID = "dup203";
-int TST_TOTAL = 1;
-
-int main(int ac, char **av)
+#include <stdio.h>
+#include <unistd.h>
+#include "tst_test.h"
+#include "tst_safe_macros.h"
+
+static char filename0[40], filename1[40];
+static int fd0, fd1;
+
+static struct tcase {
+ char *desc;
+ int is_close;
+} tcases[] = {
+ {"Test duping over an open fd", 0},
+ {"Test duping over a close fd", 1},
+};
+
+static void run(unsigned int i)
{
- int fd0, fd1, fd2, rval;
- char filename0[40], filename1[40];
+ int fd2, rval;
char buf[40];
- int lc;
-
- tst_parse_opts(ac, av, NULL, NULL);
-
- setup();
-
- for (lc = 0; TEST_LOOPING(lc); lc++) {
-
- tst_count = 0;
-//block1:
- tst_resm(TINFO, "Enter block 1");
- tst_resm(TINFO, "Test duping over an open fd");
-
- sprintf(filename0, "dup202.file0.%d\n", getpid());
- sprintf(filename1, "dup202.file1.%d\n", getpid());
- unlink(filename0);
- unlink(filename1);
-
- if ((fd0 = creat(filename0, 0666)) == -1)
- tst_brkm(TBROK, cleanup, "cannot create first file");
- if (write(fd0, filename0, strlen(filename0)) == -1)
- tst_brkm(TBROK, cleanup, "filename0: write(2) failed");
-
- if ((fd1 = creat(filename1, 0666)) == -1)
- tst_brkm(TBROK, cleanup, "Cannot create second file");
- if (write(fd1, filename1, strlen(filename1)) == -1)
- tst_brkm(TBROK, cleanup, "filename1: write(2) failed");
+ struct tcase *tc = tcases + i;
- SAFE_CLOSE(cleanup, fd0);
- if ((fd0 = open(filename0, O_RDONLY)) == -1)
- tst_brkm(TBROK, cleanup, "open(2) on filename0 failed");
+ tst_res(TINFO, tc->desc);
- SAFE_CLOSE(cleanup, fd1);
- if ((fd1 = open(filename1, O_RDONLY)) == -1)
- tst_brkm(TBROK, cleanup, "open(2) on filename1 failed");
+ fd0 = SAFE_CREAT(filename0, 0666);
+ SAFE_WRITE(1, fd0, filename0, strlen(filename0));
+ SAFE_CLOSE(fd0);
- TEST(dup2(fd0, fd1));
-
- if ((fd2 = TEST_RETURN) == -1) {
- tst_resm(TFAIL, "call failed unexpectedly");
- } else {
- if (fd1 != fd2) {
- tst_resm(TFAIL, "file descriptors don't match");
- break;
- }
-
- memset(buf, 0, sizeof(buf));
- if (read(fd2, buf, sizeof(buf)) == -1)
- tst_brkm(TBROK, cleanup, "read(2) failed");
- if (strcmp(buf, filename0) != 0)
- tst_resm(TFAIL, "read from file got bad data");
- tst_resm(TPASS, "dup2 test 1 functionality is correct");
- }
-
- close(fd0);
- close(fd1);
- close(fd2);
- unlink(filename0);
- unlink(filename1);
-
- tst_resm(TINFO, "Exit block 1");
-
-//block2:
- tst_resm(TINFO, "Enter block 2");
- tst_resm(TINFO, "Test close on exec flag");
-
- sprintf(filename0, "dup02.%d\n", getpid());
- unlink(filename0);
-
- if ((fd0 = creat(filename0, 0666)) == -1) {
- tst_brkm(TBROK, cleanup, "Cannot create first file");
- }
- if (fcntl(fd0, F_SETFD, 1) == -1) {
- tst_brkm(TBROK, cleanup, "setting close on exec flag "
- "on fd0 failed");
- }
-
- if ((fd2 = creat(filename1, 0666)) == -1) {
- tst_brkm(TBROK, cleanup, "Cannot create second file");
- }
+ fd1 = SAFE_CREAT(filename1, 0666);
+ SAFE_WRITE(1, fd1, filename1, strlen(filename1));
+ fd0 = SAFE_OPEN(filename0, O_RDONLY);
+ SAFE_FCNTL(fd0, F_SETFD, 1);
+ if (tc->is_close) {
/* SAFE_CLOSE() sets the fd to -1 avoid it here */
- rval = fd2;
- SAFE_CLOSE(cleanup, rval);
-
- TEST(dup2(fd0, fd2));
-
- if ((fd1 = TEST_RETURN) == -1) {
- tst_resm(TFAIL, "call failed unexpectedly");
- } else {
- if (fd1 != fd2) {
- tst_resm(TFAIL, "bad dup2 descriptor %d", fd1);
- break;
- }
-
- if ((rval = fcntl(fd1, F_GETFD, 0)) != 0) {
- tst_resm(TBROK | TERRNO,
- "fcntl F_GETFD on fd1 failed; expected a "
- "return value of 0x0, got %#x", rval);
- break;
- }
- if ((rval = (fcntl(fd0, F_GETFL, 0) & O_ACCMODE)) !=
- O_WRONLY) {
- tst_resm(TFAIL, "fctnl F_GETFL bad rval on fd0 "
- "Expected %#x got %#x", O_WRONLY,
- rval);
- }
- tst_resm(TPASS, "dup2 test 2 functionality is correct");
- }
-
- close(fd0);
- close(fd1);
-
- unlink(filename0);
- unlink(filename1);
- tst_resm(TINFO, "Exit block 2");
+ rval = fd1;
+ SAFE_CLOSE(rval);
+ }
+
+ TEST(dup2(fd0, fd1));
+ fd2 = TST_RET;
+ if (TST_RET == -1) {
+ tst_res(TFAIL, "call failed unexpectedly");
+ goto free;
+ }
+ if (fd1 != fd2) {
+ tst_res(TFAIL, "file descriptors don't match");
+ goto free;
}
- cleanup();
- tst_exit();
+ memset(buf, 0, sizeof(buf));
+ SAFE_READ(0, fd2, buf, sizeof(buf));
+ if (strcmp(buf, filename0) != 0)
+ tst_res(TFAIL, "read from file got bad data");
+ else
+ tst_res(TPASS, "test the content of file is correct");
+
+ rval = SAFE_FCNTL(fd2, F_GETFD);
+ if (rval != 0)
+ tst_res(TFAIL, "fcntl F_GETFD on fd2 failed; expected a "
+ "return value of 0x0, got %#x", rval);
+ else
+ tst_res(TPASS, "test the FD_CLOEXEC flag is correct");
+free:
+ SAFE_CLOSE(fd0);
+ SAFE_CLOSE(fd1);
+ SAFE_UNLINK(filename0);
+ SAFE_UNLINK(filename1);
}
-/*
- * setup() - performs all ONE TIME setup for this test.
- */
-void setup(void)
+static void setup(void)
{
+ int pid;
- tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
- TEST_PAUSE;
-
- tst_tmpdir();
+ pid = getpid();
+ sprintf(filename0, "dup203.file0.%d\n", pid);
+ sprintf(filename1, "dup203.file1.%d\n", pid);
}
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- * completion or premature exit.
- */
-void cleanup(void)
+static void cleanup(void)
{
- tst_rmdir();
+ close(fd0);
+ close(fd1);
}
+
+static struct tst_test test = {
+ .setup = setup,
+ .tcnt = ARRAY_SIZE(tcases),
+ .needs_tmpdir = 1,
+ .test = run,
+ .cleanup = cleanup,
+};
--
2.31.1
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply related [flat|nested] 7+ messages in thread* [LTP] [PATCH v6 4/5] syscalls/dup2/dup204: Convert to new API
2021-09-20 3:37 [LTP] [PATCH v6 0/5] Convert syscalls/dup2/dup2{01...05} to new API QI Fuli
` (2 preceding siblings ...)
2021-09-20 3:37 ` [LTP] [PATCH v6 3/5] syscalls/dup2/dup203: " QI Fuli
@ 2021-09-20 3:37 ` QI Fuli
2021-09-20 3:37 ` [LTP] [PATCH v6 5/5] syscalls/dup2/dup205: " QI Fuli
2021-09-20 5:32 ` [LTP] [PATCH v6 0/5] Convert syscalls/dup2/dup2{01...05} " Xiao Yang
5 siblings, 0 replies; 7+ messages in thread
From: QI Fuli @ 2021-09-20 3:37 UTC (permalink / raw)
To: ltp; +Cc: QI Fuli
From: QI Fuli <qi.fuli@fujitsu.com>
Signed-off-by: QI Fuli <qi.fuli@fujitsu.com>
---
testcases/kernel/syscalls/dup2/dup204.c | 147 +++++++-----------------
1 file changed, 40 insertions(+), 107 deletions(-)
diff --git a/testcases/kernel/syscalls/dup2/dup204.c b/testcases/kernel/syscalls/dup2/dup204.c
index a357bc17e..c9304d5c3 100644
--- a/testcases/kernel/syscalls/dup2/dup204.c
+++ b/testcases/kernel/syscalls/dup2/dup204.c
@@ -1,128 +1,61 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
+ * Copyright (c) International Business Machines Corp., 2001
*
- * Copyright (c) International Business Machines Corp., 2001
+ * [Description]
*
- * 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.
+ * Test whether the inode number are the same for both file descriptors.
*
- * 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
- * dup204.c
- *
- * DESCRIPTION
- * Testcase to check the basic functionality of dup2(2).
- *
- * ALGORITHM
- * attempt to call dup2() on read/write ends of a pipe
- *
- * USAGE: <for command-line>
- * dup204 [-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.
- *
- * RESTRICTION
- * NONE
*/
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-#include <sys/types.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <signal.h>
-#include <string.h>
-#include "test.h"
-#include "safe_macros.h"
+#include <unistd.h>
+#include "tst_test.h"
+#include "tst_safe_macros.h"
-void setup();
-void cleanup();
+static int fd[2] = {-1, -1};
+static int nfd[2] = {10, 20};
-char *TCID = "dup204";
-int TST_TOTAL = 2;
-
-int fd[2];
-int nfd[2];
-
-int main(int ac, char **av)
+static void setup(void)
{
- int lc;
- int i;
- struct stat oldbuf, newbuf;
-
- tst_parse_opts(ac, av, NULL, NULL);
-
- setup();
-
- for (lc = 0; TEST_LOOPING(lc); lc++) {
-
- tst_count = 0;
-
- /* loop through the test cases */
- for (i = 0; i < TST_TOTAL; i++) {
- TEST(dup2(fd[i], nfd[i]));
-
- if (TEST_RETURN == -1) {
- tst_resm(TFAIL, "call failed unexpectedly");
- continue;
- }
-
- SAFE_FSTAT(cleanup, fd[i], &oldbuf);
- SAFE_FSTAT(cleanup, nfd[i], &newbuf);
+ SAFE_PIPE(fd);
+}
- if (oldbuf.st_ino != newbuf.st_ino)
- tst_resm(TFAIL, "original and duped "
- "inodes do not match");
- else
- tst_resm(TPASS, "original and duped "
- "inodes are the same");
+static void cleanup(void)
+{
+ unsigned int i;
- SAFE_CLOSE(cleanup, TEST_RETURN);
- }
+ for (i = 0; i < ARRAY_SIZE(fd); i++) {
+ close(fd[i]);
+ close(nfd[i]);
}
-
- cleanup();
- tst_exit();
}
-void setup(void)
+static void run(unsigned int i)
{
- fd[0] = -1;
+ struct stat oldbuf, newbuf;
- tst_sig(FORK, DEF_HANDLER, cleanup);
+ TEST(dup2(fd[i], nfd[i]));
+ if (TST_RET == -1) {
+ tst_res(TFAIL, "call failed unexpectedly");
+ return;
+ }
- TEST_PAUSE;
+ SAFE_FSTAT(fd[i], &oldbuf);
+ SAFE_FSTAT(nfd[i], &newbuf);
- tst_tmpdir();
+ if (oldbuf.st_ino != newbuf.st_ino)
+ tst_res(TFAIL, "original inode(%ld) and duped inode(%ld) "
+ "do not match", oldbuf.st_ino, newbuf.st_ino);
+ else
+ tst_res(TPASS, "original inode(%ld) and duped inode(%ld) "
+ "are the same", oldbuf.st_ino, newbuf.st_ino);
- SAFE_PIPE(cleanup, fd);
+ SAFE_CLOSE(TST_RET);
}
-void cleanup(void)
-{
- int i;
-
- for (i = 0; i < (int)ARRAY_SIZE(fd); i++) {
- close(fd[i]);
- close(nfd[i]);
- }
-
- tst_rmdir();
-}
+static struct tst_test test = {
+ .tcnt = ARRAY_SIZE(fd),
+ .test = run,
+ .setup = setup,
+ .cleanup = cleanup,
+};
--
2.31.1
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply related [flat|nested] 7+ messages in thread* [LTP] [PATCH v6 5/5] syscalls/dup2/dup205: Convert to new API
2021-09-20 3:37 [LTP] [PATCH v6 0/5] Convert syscalls/dup2/dup2{01...05} to new API QI Fuli
` (3 preceding siblings ...)
2021-09-20 3:37 ` [LTP] [PATCH v6 4/5] syscalls/dup2/dup204: " QI Fuli
@ 2021-09-20 3:37 ` QI Fuli
2021-09-20 5:32 ` [LTP] [PATCH v6 0/5] Convert syscalls/dup2/dup2{01...05} " Xiao Yang
5 siblings, 0 replies; 7+ messages in thread
From: QI Fuli @ 2021-09-20 3:37 UTC (permalink / raw)
To: ltp; +Cc: QI Fuli
From: QI Fuli <qi.fuli@fujitsu.com>
Signed-off-by: QI Fuli <qi.fuli@fujitsu.com>
---
testcases/kernel/syscalls/dup2/dup205.c | 178 +++++++++---------------
1 file changed, 62 insertions(+), 116 deletions(-)
diff --git a/testcases/kernel/syscalls/dup2/dup205.c b/testcases/kernel/syscalls/dup2/dup205.c
index 0b324531f..cd4254375 100644
--- a/testcases/kernel/syscalls/dup2/dup205.c
+++ b/testcases/kernel/syscalls/dup2/dup205.c
@@ -1,134 +1,80 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
- *
- * Copyright (c) International Business Machines Corp., 2002
- *
- * 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
+ * Copyright (c) International Business Machines Corp., 2002
+ * Ported from SPIE, section2/iosuite/dup6.c, by Airong Zhang
*/
-/* Ported from SPIE, section2/iosuite/dup6.c, by Airong Zhang */
-
-/*======================================================================
- =================== TESTPLAN SEGMENT ===================
->KEYS: < dup2()
->WHAT: < Does dup return -1 on the 21st file?
->HOW: < Create up to _NFILE files and check for -1 return on the
- < next attempt
- < Should check NOFILE as well as _NFILE. 19-Jun-84 Dale.
->BUGS: <
-======================================================================*/
+/*\
+ * [Description]
+ * Negative test for dup2() with max open file descriptors.
+ */
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <fcntl.h>
+#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
-#include "test.h"
-
-char *TCID = "dup205";
-int TST_TOTAL = 1;
-int *fildes;
-int min;
-int local_flag;
-
-#define PASSED 1
-#define FAILED 0
-
-static void setup(void);
-static void cleanup(void);
-
-int main(int ac, char *av[])
-{
- int ifile;
- char pfilname[40];
- int serrno;
-
- int lc;
-
- ifile = -1;
-
- tst_parse_opts(ac, av, NULL, NULL);
-
- local_flag = PASSED;
-
- setup();
-
- for (lc = 0; TEST_LOOPING(lc); lc++) {
-
- sprintf(pfilname, "./dup205.%d\n", getpid());
- unlink(pfilname);
- serrno = 0;
- if ((fildes[0] = creat(pfilname, 0666)) == -1)
- tst_brkm(TBROK | TERRNO, cleanup, "creat failed");
- else {
- fildes[fildes[0]] = fildes[0];
- for (ifile = fildes[0] + 1; ifile < min + 10; ifile++) {
- if ((fildes[ifile] = dup2(fildes[ifile - 1],
- ifile)) == -1) {
- serrno = errno;
- break;
- } else {
- if (fildes[ifile] != ifile) {
- tst_brkm(TFAIL, cleanup,
- "got wrong descriptor "
- "number back (%d != %d)",
- fildes[ifile], ifile);
- }
- }
- } /* end for */
- if (ifile < min) {
- tst_resm(TFAIL, "Not enough files duped");
- local_flag = FAILED;
- } else if (ifile > min) {
- tst_resm(TFAIL, "Too many files duped");
- local_flag = FAILED;
- }
- if (serrno != EBADF && serrno != EMFILE &&
- serrno != EINVAL) {
- tst_resm(TFAIL, "bad errno on dup2 failure");
- local_flag = FAILED;
- }
- }
- unlink(pfilname);
- for (ifile = fildes[0]; ifile < min + 10; ifile++)
- close(fildes[ifile]);
- if (local_flag == PASSED) {
- tst_resm(TPASS, "Test passed.");
- } else {
- tst_resm(TFAIL, "Test failed.");
- }
+#include "tst_test.h"
+#include "tst_safe_macros.h"
- }
- cleanup();
- tst_exit();
-}
+static int *fildes;
+static int min;
+static char pfilname[40];
static void setup(void)
{
- tst_tmpdir();
-
min = getdtablesize(); /* get number of files allowed open */
- fildes = malloc((min + 10) * sizeof(int));
- if (fildes == NULL)
- tst_brkm(TBROK | TERRNO, cleanup, "malloc error");
+ fildes = SAFE_MALLOC((min + 10) * sizeof(int));
+ memset(fildes, -1, (min + 10) * sizeof(int));
+ sprintf(pfilname, "./dup205.%d\n", getpid());
}
static void cleanup(void)
{
if (fildes != NULL)
free(fildes);
- tst_rmdir();
}
+
+static void run(void)
+{
+ int ifile = -1, rc = 0;
+
+ fildes[0] = SAFE_CREAT(pfilname, 0666);
+ fildes[fildes[0]] = fildes[0];
+ for (ifile = fildes[0] + 1; ifile < min + 10; ifile++) {
+ TEST(dup2(fildes[ifile - 1], ifile));
+ if ((fildes[ifile] = TST_RET) == -1)
+ break;
+ if (fildes[ifile] != ifile)
+ tst_brk(TFAIL, "got wrong descriptor number back "
+ "(%d != %d)", fildes[ifile], ifile);
+ }
+
+ if (ifile < min) {
+ tst_res(TFAIL, "Not enough files duped");
+ rc++;
+ } else if (ifile > min) {
+ tst_res(TFAIL, "Too many files duped");
+ rc++;
+ }
+ if (TST_ERR != EBADF && TST_ERR != EMFILE && TST_ERR != EINVAL) {
+ tst_res(TFAIL, "bad errno on dup2 failure");
+ rc++;
+ }
+
+ if (rc)
+ tst_res(TFAIL, "Test failed");
+ else
+ tst_res(TPASS, "Test passed");
+
+ SAFE_UNLINK(pfilname);
+ for (ifile = fildes[0]; ifile < min + 10; ifile++) {
+ if (fildes[ifile] > 0)
+ SAFE_CLOSE(fildes[ifile]);
+ }
+}
+
+static struct tst_test test = {
+ .needs_tmpdir = 1,
+ .test_all = run,
+ .setup = setup,
+ .cleanup = cleanup,
+};
--
2.31.1
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [LTP] [PATCH v6 0/5] Convert syscalls/dup2/dup2{01...05} to new API
2021-09-20 3:37 [LTP] [PATCH v6 0/5] Convert syscalls/dup2/dup2{01...05} to new API QI Fuli
` (4 preceding siblings ...)
2021-09-20 3:37 ` [LTP] [PATCH v6 5/5] syscalls/dup2/dup205: " QI Fuli
@ 2021-09-20 5:32 ` Xiao Yang
5 siblings, 0 replies; 7+ messages in thread
From: Xiao Yang @ 2021-09-20 5:32 UTC (permalink / raw)
To: QI Fuli, ltp; +Cc: QI Fuli
Hi Qi,
I have pushed the patch set with two minor changes:
1) Fix some warnings from checkpatch.pl.
2) Fix the description in dup204.
Best Regards,
Xiao Yang
On 9/20/21 11:37 AM, QI Fuli wrote:
> From: QI Fuli <qi.fuli@fujitsu.com>
>
> Convert syscalls/dup2/dup2{01...05} to new API
>
> QI Fuli (5):
> syscalls/dup2/dup201: Convert to new API
> syscalls/dup2/dup202: Convert to new API
> syscalls/dup2/dup203: Convert to new API
> syscalls/dup2/dup204: Convert to new API
> syscalls/dup2/dup205: Convert to new API
>
> testcases/kernel/syscalls/dup2/dup201.c | 174 +++-------------
> testcases/kernel/syscalls/dup2/dup202.c | 196 ++++++------------
> testcases/kernel/syscalls/dup2/dup203.c | 265 ++++++++----------------
> testcases/kernel/syscalls/dup2/dup204.c | 147 ++++---------
> testcases/kernel/syscalls/dup2/dup205.c | 178 ++++++----------
> 5 files changed, 276 insertions(+), 684 deletions(-)
>
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply [flat|nested] 7+ messages in thread