Skip to contentSkip to conversation

Convert syscalls/dup3/dup3_{01,02} to new API

PATCH Superseded QI Fuli 2 participants 5 messages Sep 16, 2021 – Sep 17, 2021

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

QI Fuli

author
#0 lore raw

cover Convert syscalls/dup3/dup3_{01,02} to new API

From: QI Fuli <[email protected]>

Convert syscalls/dup3/dup3_{01,02} to new API

QI Fuli (2):
syscalls/dup3_01: Rewrite and convert to new API syscalls/dup3_02: Convert to new API

 testcases/kernel/syscalls/dup3/dup3_01.c | 157 ++++++++---------------
 testcases/kernel/syscalls/dup3/dup3_02.c | 111 ++++------------
 2 files changed, 75 insertions(+), 193 deletions(-)
Signature · 1 line
2.31.1
author
#1 lore raw

PATCH 1/2 syscalls/dup3_01: Rewrite and convert to new API

From: QI Fuli <[email protected]>

- divide into two testcases
- convert to new API

---
 testcases/kernel/syscalls/dup3/dup3_01.c | 157 ++++++++---------------
 1 file changed, 50 insertions(+), 107 deletions(-)
testcases/kernel/syscalls/dup3/dup3_01.c +50 -107
index 6a44ec809..9a233f51b 100644
@@ -1,120 +1,63 @@
-/******************************************************************************/
-/*                                                                            */
-/* Copyright (c) Ulrich Drepper <[email protected]>                          */
-/* Copyright (c) International Business Machines  Corp., 2009                 */
-/*                                                                            */
-/* 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    */
-/*                                                                            */
-/******************************************************************************/
-/******************************************************************************/
-/*                                                                            */
-/* File:        dup3_01.c                                                     */
-/*                                                                            */
-/* Description: This Program tests the new system call introduced in 2.6.27.  */
-/*              Ulrich??s comment as in:                                       */
-/* http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=336dd1f70ff62d7dd8655228caed4c5bfc818c56 */
-/*              says:                                                         */
-/* This patch adds the new dup3 syscall.  It extends the old dup2 syscall by  */
-/* one parameter which is meant to hold a flag value.  Support for the        */
-/* O_CLOEXEC flag is added in this patch. The following test must be adjusted */
-/* for architectures other than x86 and x86-64 and in case the                */
-/* syscall numbers changed.                                                   */
-/*                                                                            */
-/* Usage:  <for command-line>                                                 */
-/* dup3_01 [-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.                                */
-/*                                                                            */
-/* Total Tests: 1                                                             */
-/*                                                                            */
-/* Test Name:   dup3_01                                                       */
-/*                                                                            */
-/* Author:      Ulrich Drepper <[email protected]>                           */
-/*                                                                            */
-/* History:     Created - Jan 13 2009 - Ulrich Drepper <[email protected]>   */
-/*              Ported to LTP                                                 */
-/*                      - Jan 13 2009 - Subrata <[email protected]>  */
-/******************************************************************************/
-#include <fcntl.h>
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) Ulrich Drepper <[email protected]>
+ * Copyright (c) International Business Machines  Corp., 2009
+ *	Created - Jan 13 2009 - Ulrich Drepper <[email protected]>
+ *	Ported to LTP - Jan 13 2009 - Subrata <[email protected]>
+ */
+
+/*\
+ * [Description]
+ * 	Testcase to check whether dup3() supports O_CLOEXEC flag.
+ */
+
 #include <stdio.h>
-#include <time.h>
-#include <unistd.h>
-#include <sys/syscall.h>
+#include <stdbool.h>
 #include <errno.h>
 
-#include "test.h"
-#include "lapi/fcntl.h"
+#include "tst_test.h"
 #include "lapi/syscalls.h"
-
-char *TCID = "dup3_01";
-int TST_TOTAL = 1;
-
-void cleanup(void)
+#include "tst_safe_macros.h"
+
+static struct tcase {
+	int oflag;
+	bool tflag;
+	char *desc;
+} tcases [] = {
+	{0, true, "dup3(0)"},
+	{O_CLOEXEC, false, "dup3(O_CLOEXEC)"},
+};
+
+static void setup(void)
 {
-	tst_rmdir();
-}
-
-void setup(void)
-{
-	TEST_PAUSE;
-	tst_tmpdir();
-}
+	if ((tst_kvercmp(2, 6, 27)) < 0)
+		tst_brk(TCONF,
+			"This test can only run on kernels 2.6.27 and higher");
+};
 
-int main(int argc, char *argv[])
+static void run(unsigned int i)
 {
 	int fd, coe;
+	struct tcase *tc = tcases + i;
 
-	tst_parse_opts(argc, argv, NULL, NULL);
+	TEST(tst_syscall(__NR_dup3, 1, 4, tc->oflag));
 
-	if ((tst_kvercmp(2, 6, 27)) < 0)
-		tst_brkm(TCONF, NULL,
-			 "This test can only run on kernels that are 2.6.27 and higher");
-	setup();
+	fd = TST_RET;
+	if (TST_RET == -1)
+		tst_brk(TFAIL | TTERRNO, "%s failed", tc->desc);
 
-	fd = ltp_syscall(__NR_dup3, 1, 4, 0);
-	if (fd == -1) {
-		tst_brkm(TFAIL | TERRNO, cleanup, "dup3(0) failed");
-	}
-	coe = fcntl(fd, F_GETFD);
-	if (coe == -1) {
-		tst_brkm(TBROK | TERRNO, cleanup, "fcntl failed");
-	}
-	if (coe & FD_CLOEXEC) {
-		tst_brkm(TFAIL, cleanup, "dup3(0) set close-on-exec flag");
-	}
-	close(fd);
+	coe = SAFE_FCNTL(fd, F_GETFD);
+	if ((coe & FD_CLOEXEC) == tc->tflag)
+		tst_brk(TFAIL, "%s set close-on-exec flag", tc->desc);
+	else
+		tst_res(TPASS, "%s PASSED", tc->desc);
 
-	fd = ltp_syscall(__NR_dup3, 1, 4, O_CLOEXEC);
-	if (fd == -1) {
-		tst_brkm(TFAIL | TERRNO, cleanup, "dup3(O_CLOEXEC) failed");
-	}
-	coe = fcntl(fd, F_GETFD);
-	if (coe == -1) {
-		tst_brkm(TBROK | TERRNO, cleanup, "fcntl failed");
-	}
-	if ((coe & FD_CLOEXEC) == 0) {
-		tst_brkm(TFAIL, cleanup,
-			 "dup3(O_CLOEXEC) set close-on-exec flag");
-	}
-	close(fd);
-	tst_resm(TPASS, "dup3(O_CLOEXEC) PASSED");
+	SAFE_CLOSE(fd);
+};
 
-	cleanup();
-	tst_exit();
-}
+static struct tst_test test = {
+	.setup = setup,
+	.tcnt = ARRAY_SIZE(tcases),
+	.needs_tmpdir = 1,
+	.test = run,
+};
Signature · 1 line
2.31.1
#2 lore raw

PATCH 1/2 syscalls/dup3_01: Rewrite and convert to new API

Hi Qi

Quoted 93 lines

From: QI Fuli<[email protected]>

- divide into two testcases
- convert to new API

---
  testcases/kernel/syscalls/dup3/dup3_01.c | 157 ++++++++---------------
  1 file changed, 50 insertions(+), 107 deletions(-)
testcases/kernel/syscalls/dup3/dup3_01.c +15 -59
index 6a44ec809..9a233f51b 100644
@@ -1,120 +1,63 @@
-/******************************************************************************/
-/*                                                                            */
-/* Copyright (c) Ulrich Drepper<[email protected]>                           */
-/* Copyright (c) International Business Machines  Corp., 2009                 */
-/*                                                                            */
-/* 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    */
-/*                                                                            */
-/******************************************************************************/
-/******************************************************************************/
-/*                                                                            */
-/* File:        dup3_01.c                                                     */
-/*                                                                            */
-/* Description: This Program tests the new system call introduced in 2.6.27.  */
-/*              Ulrich?s comment as in:                                       */
-/* http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=336dd1f70ff62d7dd8655228caed4c5bfc818c56 */
-/*              says:                                                         */
-/* This patch adds the new dup3 syscall.  It extends the old dup2 syscall by  */
-/* one parameter which is meant to hold a flag value.  Support for the        */
-/* O_CLOEXEC flag is added in this patch. The following test must be adjusted */
-/* for architectures other than x86 and x86-64 and in case the                */
-/* syscall numbers changed.                                                   */
-/*                                                                            */
-/* Usage:<for command-line>                                                  */
-/* dup3_01 [-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.                                */
-/*                                                                            */
-/* Total Tests: 1                                                             */
-/*                                                                            */
-/* Test Name:   dup3_01                                                       */
-/*                                                                            */
-/* Author:      Ulrich Drepper<[email protected]>                            */
-/*                                                                            */
-/* History:     Created - Jan 13 2009 - Ulrich Drepper<[email protected]>    */
-/*              Ported to LTP                                                 */
-/*                      - Jan 13 2009 - Subrata<[email protected]>   */
-/******************************************************************************/
-#include<fcntl.h>
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) Ulrich Drepper<[email protected]>
+ * Copyright (c) International Business Machines  Corp., 2009
+ *	Created - Jan 13 2009 - Ulrich Drepper<[email protected]>
+ *	Ported to LTP - Jan 13 2009 - Subrata<[email protected]>
+ */
+
+/*\
+ * [Description]
+ * 	Testcase to check whether dup3() supports O_CLOEXEC flag.
+ */
+
  #include<stdio.h>
-#include<time.h>
-#include<unistd.h>
-#include<sys/syscall.h>
+#include<stdbool.h>
  #include<errno.h>
 
-#include "test.h"
-#include "lapi/fcntl.h"
+#include "tst_test.h"
  #include "lapi/syscalls.h"

testcases/kernel/syscalls/dup3/dup3_01.c line 24

Quoted 10 lines
testcases/kernel/syscalls/dup3/dup3_01.c +5 -5
-
-char *TCID = "dup3_01";
-int TST_TOTAL = 1;
-
-void cleanup(void)
+#include "tst_safe_macros.h"
+
+static struct tcase {
+	int oflag;
+	bool tflag;

This variable(tflag)looks confusing. Can we use a meaningful name?

testcases/kernel/syscalls/dup3/dup3_01.c line 28

Quoted 4 lines
testcases/kernel/syscalls/dup3/dup3_01.c +4 -0
+	char *desc;
+} tcases [] = {
+	{0, true, "dup3(0)"},
+	{O_CLOEXEC, false, "dup3(O_CLOEXEC)"},

I prefer to use dup3(1,4,0) and dup3(1,4,O_CLOEXEC) because it is more clear.

Quoted 5 lines
testcases/kernel/syscalls/dup3/dup3_01.c +3 -1
+};
+
+static void setup(void)
  {
-	tst_rmdir();

testcases/kernel/syscalls/dup3/dup3_01.c line 35

Quoted 10 lines
testcases/kernel/syscalls/dup3/dup3_01.c +3 -7
-}
-
-void setup(void)
-{
-	TEST_PAUSE;
-	tst_tmpdir();
-}
+	if ((tst_kvercmp(2, 6, 27))<  0)
+		tst_brk(TCONF,
+			"This test can only run on kernels 2.6.27 and higher");

Lastest upstream kernel has reached to 5.15-rc1 and we don't need to check this very old kernel version. So we can remove this check.

ps: user who use old distros can use old ltp release to test. I don't want to keep it.

testcases/kernel/syscalls/dup3/dup3_01.c line 40

Quoted 6 lines
testcases/kernel/syscalls/dup3/dup3_01.c +2 -1
+};
 
-int main(int argc, char *argv[])
+static void run(unsigned int i)
  {
  	int fd, coe;

coe represent what? ret looks better.

testcases/kernel/syscalls/dup3/dup3_01.c line 43

Quoted 4 lines
testcases/kernel/syscalls/dup3/dup3_01.c +2 -1
+	struct tcase *tc = tcases + i;
 
-	tst_parse_opts(argc, argv, NULL, NULL);
+	TEST(tst_syscall(__NR_dup3, 1, 4, tc->oflag));

I think this case was introduced by long time ago and glibc doesn't support it so case uses syscall directly. Now, I think using glicb wrapper is enough.

testcases/kernel/syscalls/dup3/dup3_01.c line 47

Quoted 8 lines
testcases/kernel/syscalls/dup3/dup3_01.c +3 -4
-	if ((tst_kvercmp(2, 6, 27))<  0)
-		tst_brkm(TCONF, NULL,
-			 "This test can only run on kernels that are 2.6.27 and higher");
-	setup();
+	fd = TST_RET;
+	if (TST_RET == -1)
+		tst_brk(TFAIL | TTERRNO, "%s failed", tc->desc);

We don't need to break and should run the second case. Please use tst_res and return.

Quoted 6 lines
testcases/kernel/syscalls/dup3/dup3_01.c +0 -5
-	fd = ltp_syscall(__NR_dup3, 1, 4, 0);
-	if (fd == -1) {
-		tst_brkm(TFAIL | TERRNO, cleanup, "dup3(0) failed");
-	}
-	coe = fcntl(fd, F_GETFD);

testcases/kernel/syscalls/dup3/dup3_01.c line 51

Quoted 10 lines
testcases/kernel/syscalls/dup3/dup3_01.c +3 -7
-	if (coe == -1) {
-		tst_brkm(TBROK | TERRNO, cleanup, "fcntl failed");
-	}
-	if (coe&  FD_CLOEXEC) {
-		tst_brkm(TFAIL, cleanup, "dup3(0) set close-on-exec flag");
-	}
-	close(fd);
+	coe = SAFE_FCNTL(fd, F_GETFD);
+	if ((coe&  FD_CLOEXEC) == tc->tflag)
+		tst_brk(TFAIL, "%s set close-on-exec flag", tc->desc);

Use tst_res.

Quoted 17 lines
testcases/kernel/syscalls/dup3/dup3_01.c +2 -14
+	else
+		tst_res(TPASS, "%s PASSED", tc->desc);
 
-	fd = ltp_syscall(__NR_dup3, 1, 4, O_CLOEXEC);
-	if (fd == -1) {
-		tst_brkm(TFAIL | TERRNO, cleanup, "dup3(O_CLOEXEC) failed");
-	}
-	coe = fcntl(fd, F_GETFD);
-	if (coe == -1) {
-		tst_brkm(TBROK | TERRNO, cleanup, "fcntl failed");
-	}
-	if ((coe&  FD_CLOEXEC) == 0) {
-		tst_brkm(TFAIL, cleanup,
-			 "dup3(O_CLOEXEC) set close-on-exec flag");
-	}
-	close(fd);
-	tst_resm(TPASS, "dup3(O_CLOEXEC) PASSED");

testcases/kernel/syscalls/dup3/dup3_01.c line 61

Quoted 10 lines
testcases/kernel/syscalls/dup3/dup3_01.c +6 -3
+	SAFE_CLOSE(fd);
+};
 
-	cleanup();
-	tst_exit();
-}
+static struct tst_test test = {
+	.setup = setup,
+	.tcnt = ARRAY_SIZE(tcases),
+	.needs_tmpdir = 1,

Remove.

Best Regards
Yang Xu

Quoted 6 lines
testcases/kernel/syscalls/dup3/dup3_01.c +2 -0
+	.test = run,
+};
 
 
author
#3 lore raw

PATCH 2/2 syscalls/dup3_02: Convert to new API

In reply to QI Fuli

From: QI Fuli <[email protected]>

---
 testcases/kernel/syscalls/dup3/dup3_02.c | 111 +++++------------------
 1 file changed, 25 insertions(+), 86 deletions(-)
testcases/kernel/syscalls/dup3/dup3_02.c +25 -86
index e49ec3575..76c4e6e35 100644
@@ -1,118 +1,57 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (c) 2013 Fujitsu Ltd.
  * Author: Xiaoguang Wang <[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; if not, write the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/*
- * Description:
+/*\
+ * [Description]
  * Verify that,
  *  1. dup3() fails with -1 return value and sets errno to EINVAL
  *     if flags contain an invalid value or oldfd was equal to newfd.
  */
 
-#define _GNU_SOURCE
-
-#include <stdio.h>
 #include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/types.h>
-
-#include "test.h"
-#include "safe_macros.h"
-#include "lapi/fcntl.h"
+#include "tst_test.h"
+#include "tst_safe_macros.h"
 #include "lapi/syscalls.h"
 
-
-static void setup(void);
-static void cleanup(void);
-
-#define INVALID_FLAG	-1
-
 static int old_fd;
-static int new_fd;
+static int new_fd = -1;
 
-static struct test_case_t {
+static struct tcase {
 	int *oldfd;
 	int *newfd;
 	int flags;
-	int exp_errno;
-} test_cases[] = {
-	{&old_fd, &old_fd, O_CLOEXEC, EINVAL},
-	{&old_fd, &old_fd, 0, EINVAL},
-	{&old_fd, &new_fd, INVALID_FLAG, EINVAL}
+} tcases[] = {
+	{&old_fd, &old_fd, O_CLOEXEC},
+	{&old_fd, &old_fd, 0},
+	{&old_fd, &new_fd, -1}
 };
 
-char *TCID = "dup3_02";
-int TST_TOTAL = ARRAY_SIZE(test_cases);
-
-int main(int ac, char **av)
+static void run(unsigned int i)
 {
-	int lc;
-	int i;
-
-	tst_parse_opts(ac, av, NULL, NULL);
-
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		tst_count = 0;
+	struct tcase *tc = tcases + i;
 
-		for (i = 0; i < TST_TOTAL; i++) {
-			TEST(ltp_syscall(__NR_dup3, *(test_cases[i].oldfd),
-			     *(test_cases[i].newfd), test_cases[i].flags));
-
-			if (TEST_RETURN != -1) {
-				tst_resm(TFAIL, "dup3 succeeded unexpectedly");
-				continue;
-			}
-
-			if (TEST_ERRNO == test_cases[i].exp_errno) {
-				tst_resm(TPASS | TTERRNO,
-					 "dup3 failed as expected");
-			} else {
-				tst_resm(TFAIL | TTERRNO,
-					 "dup3 failed unexpectedly; expected:"
-					 "%d - %s", test_cases[i].exp_errno,
-					 strerror(test_cases[i].exp_errno));
-			}
-		}
-	}
-
-	cleanup();
-	tst_exit();
+	TST_EXP_FAIL2(tst_syscall(__NR_dup3, *tc->oldfd, *tc->newfd, tc->flags),
+				EINVAL,	"syscall(__NR_dup3, %d, %d, %d)",
+				*tc->oldfd, *tc->newfd, tc->flags);
 }
 
 static void setup(void)
 {
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	tst_tmpdir();
-
-	TEST_PAUSE;
-
-	old_fd = SAFE_CREAT(cleanup, "testeinval.file", 0644);
-	new_fd = -1;
+	old_fd = SAFE_CREAT("testeinval.file", 0644);
 }
 
 static void cleanup(void)
 {
 	if (old_fd > 0)
-		SAFE_CLOSE(NULL, old_fd);
-
-	tst_rmdir();
+		SAFE_CLOSE(old_fd);
 }
+
+static struct tst_test test = {
+	.tcnt = ARRAY_SIZE(tcases),
+	.test = run,
+	.setup = setup,
+	.cleanup = cleanup,
+};
Signature · 1 line
2.31.1
#4 lore raw

PATCH 2/2 syscalls/dup3_02: Convert to new API

Hi Qi

Quoted 29 lines

From: QI Fuli<[email protected]>

---
  testcases/kernel/syscalls/dup3/dup3_02.c | 111 +++++------------------
  1 file changed, 25 insertions(+), 86 deletions(-)
testcases/kernel/syscalls/dup3/dup3_02.c +1 -12
index e49ec3575..76c4e6e35 100644
@@ -1,118 +1,57 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
  /*
   * Copyright (c) 2013 Fujitsu Ltd.
   * Author: Xiaoguang Wang<[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; if not, write the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */

testcases/kernel/syscalls/dup3/dup3_02.c line 13

Quoted 10 lines
testcases/kernel/syscalls/dup3/dup3_02.c +2 -2
 
-/*
- * Description:
+/*\
+ * [Description]
   * Verify that,
   *  1. dup3() fails with -1 return value and sets errno to EINVAL
   *     if flags contain an invalid value or oldfd was equal to newfd.
   */
 

Test for various EINVAL error.

EINVAL - oldfd was equal to newfd and doesn't use O_CLOEXEC flag EINVAL - oldfd was equal to newfd and use O_CLOEXEC flag EINVAL - flags contain an invalid value.

Quoted 77 lines
testcases/kernel/syscalls/dup3/dup3_02.c +10 -54
-#define _GNU_SOURCE
-
-#include<stdio.h>
  #include<errno.h>
-#include<unistd.h>
-#include<fcntl.h>
-#include<string.h>
-#include<signal.h>
-#include<sys/types.h>
-
-#include "test.h"
-#include "safe_macros.h"
-#include "lapi/fcntl.h"
+#include "tst_test.h"
+#include "tst_safe_macros.h"
  #include "lapi/syscalls.h"
 
-
-static void setup(void);
-static void cleanup(void);
-
-#define INVALID_FLAG	-1
-
  static int old_fd;
-static int new_fd;
+static int new_fd = -1;
 
-static struct test_case_t {
+static struct tcase {
  	int *oldfd;
  	int *newfd;
  	int flags;
-	int exp_errno;
-} test_cases[] = {
-	{&old_fd,&old_fd, O_CLOEXEC, EINVAL},
-	{&old_fd,&old_fd, 0, EINVAL},
-	{&old_fd,&new_fd, INVALID_FLAG, EINVAL}
+} tcases[] = {
+	{&old_fd,&old_fd, O_CLOEXEC},
+	{&old_fd,&old_fd, 0},
+	{&old_fd,&new_fd, -1}
 
  };
 
-char *TCID = "dup3_02";
-int TST_TOTAL = ARRAY_SIZE(test_cases);
-
-int main(int ac, char **av)
+static void run(unsigned int i)
  {
-	int lc;
-	int i;
-
-	tst_parse_opts(ac, av, NULL, NULL);
-
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		tst_count = 0;
+	struct tcase *tc = tcases + i;
 
-		for (i = 0; i<  TST_TOTAL; i++) {
-			TEST(ltp_syscall(__NR_dup3, *(test_cases[i].oldfd),
-			     *(test_cases[i].newfd), test_cases[i].flags));
-
-			if (TEST_RETURN != -1) {
-				tst_resm(TFAIL, "dup3 succeeded unexpectedly");
-				continue;
-			}
-
-			if (TEST_ERRNO == test_cases[i].exp_errno) {
-				tst_resm(TPASS | TTERRNO,
-					 "dup3 failed as expected");
-			} else {
-				tst_resm(TFAIL | TTERRNO,
-					 "dup3 failed unexpectedly; expected:"
-					 "%d - %s", test_cases[i].exp_errno,

testcases/kernel/syscalls/dup3/dup3_02.c line 39

Quoted 10 lines
testcases/kernel/syscalls/dup3/dup3_02.c +3 -7
-					 strerror(test_cases[i].exp_errno));
-			}
-		}
-	}
-
-	cleanup();
-	tst_exit();
+	TST_EXP_FAIL2(tst_syscall(__NR_dup3, *tc->oldfd, *tc->newfd, tc->flags),
+				EINVAL,	"syscall(__NR_dup3, %d, %d, %d)",
+				*tc->oldfd, *tc->newfd, tc->flags);

glibc wrapper.

Quoted 19 lines
testcases/kernel/syscalls/dup3/dup3_02.c +1 -9
  }
 
  static void setup(void)
  {
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	tst_tmpdir();
-
-	TEST_PAUSE;
-
-	old_fd = SAFE_CREAT(cleanup, "testeinval.file", 0644);
-	new_fd = -1;
+	old_fd = SAFE_CREAT("testeinval.file", 0644);
  }
 
  static void cleanup(void)
  {
  	if (old_fd>  0)
-		SAFE_CLOSE(NULL, old_fd);

testcases/kernel/syscalls/dup3/dup3_02.c line 56

Quoted 10 lines
testcases/kernel/syscalls/dup3/dup3_02.c +7 -2
-
-	tst_rmdir();
+		SAFE_CLOSE(old_fd);
  }
+
+static struct tst_test test = {
+	.tcnt = ARRAY_SIZE(tcases),
+	.test = run,
+	.setup = setup,
+	.cleanup = cleanup,

".needs_tmpdir = 1" miss.

Best Regards
Yang Xu

Quoted 1 line

+};