[LTP] [PATCH 1/2] syscalls/fchmod_03: Convert to new API

[LTP] [PATCH 1/2] syscalls/fchmod_03: Convert to new API

[tangmeng]

Signed-off-by: tangmeng <tangmeng@uniontech.com>
---
 testcases/kernel/syscalls/fchmod/fchmod03.c | 165 +++++---------------
 1 file changed, 36 insertions(+), 129 deletions(-)

diff --git a/testcases/kernel/syscalls/fchmod/fchmod03.c b/testcases/kernel/syscalls/fchmod/fchmod03.c
index a5824f36b..8ebfc2536 100644
--- a/testcases/kernel/syscalls/fchmod/fchmod03.c
+++ b/testcases/kernel/syscalls/fchmod/fchmod03.c
@@ -1,155 +1,58 @@
+// 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
  */

-/*
- * Test Name: fchmod03
+/*\
+ * [Description]
  *
- * Test Description:
- *  Verify that, fchmod(2) will succeed to change the mode of a file
- *  and set the sticky bit on it if invoked by non-root (uid != 0)
- *  process with the following constraints,
+ * Verify that, fchmod(2) will succeed to change the mode of a file
+ * and set the sticky bit on it if invoked by non-root (uid != 0)
+ * process with the following constraints,
  *	- the process is the owner of the file.
  *	- the effective group ID or one of the supplementary group ID's of the
  *	  process is equal to the group ID of the file.
- *
- * Expected Result:
- *  fchmod() should return value 0 on success and succeeds to change
- *  the mode of specified file, sets sticky bit on it.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Create temporary directory.
- *   Pause for SIGUSR1 if option specified.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	Log the errno and Issue a FAIL message.
- *   Otherwise,
- *   	Verify the Functionality of system call
- *      if successful,
- *      	Issue Functionality-Pass message.
- *      Otherwise,
- *		Issue Functionality-Fail message.
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory created.
- *
- * Usage:  <for command-line>
- *  fchmod03 [-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:
- *  This test should be run by 'non-super-user' only.
- *
  */

-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
 #include <pwd.h>
-
-#include "test.h"
-#include "safe_macros.h"
 #include "fchmod.h"
+#include "tst_test.h"

 int fd;				/* file descriptor for test file */
-char *TCID = "fchmod03";
-int TST_TOTAL = 1;
-
 char nobody_uid[] = "nobody";
 struct passwd *ltpuser;

-void setup();			/* Main setup function for the test */
-void cleanup();			/* Main cleanup function for the test */
-
-int main(int ac, char **av)
+static void verify_fchmod(void)
 {
 	struct stat stat_buf;	/* stat struct. */
-	int lc;
 	mode_t file_mode;	/* mode permissions set on testfile */

-	tst_parse_opts(ac, av, NULL, NULL);
-
-	setup();
+	TST_EXP_PASS_SILENT(fchmod(fd, PERMS));

-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		tst_count = 0;
-
-		TEST(fchmod(fd, PERMS));
-
-		if (TEST_RETURN == -1) {
-			tst_resm(TFAIL | TTERRNO, "fchmod failed");
-			continue;
-		}
-		/*
-		 * Get the file information using
-		 * fstat(2).
-		 */
-		if (fstat(fd, &stat_buf) == -1)
-			tst_brkm(TFAIL | TERRNO, cleanup,
-				 "fstat failed");
-		file_mode = stat_buf.st_mode;
-
-		/* Verify STICKY BIT set on testfile */
-		if ((file_mode & PERMS) != PERMS)
-			tst_resm(TFAIL, "%s: Incorrect modes 0%3o, "
-				 "Expected 0777", TESTFILE, file_mode);
-		else
-			tst_resm(TPASS, "Functionality of fchmod(%d, "
-				 "%#o) successful", fd, PERMS);
-	}
-
-	cleanup();
-	tst_exit();
+	/*
+	 * Get the file information using
+	 * fstat(2).
+	 */
+	if (fstat(fd, &stat_buf) == -1)
+		tst_brk(TFAIL | TERRNO, "fstat failed");
+	file_mode = stat_buf.st_mode;
+
+	/* Verify STICKY BIT set on testfile */
+	if ((file_mode & PERMS) != PERMS)
+		tst_res(TFAIL, "%s: Incorrect modes 0%3o, "
+			 "Expected 0777", TESTFILE, file_mode);
+	else
+		tst_res(TPASS, "Functionality of fchmod(%d, "
+			 "%#o) successful", fd, PERMS);
 }

 void setup(void)
 {
-
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	tst_require_root();
-
 	ltpuser = getpwnam(nobody_uid);
-	if (ltpuser == NULL)
-		tst_brkm(TBROK | TERRNO, NULL, "getpwnam failed");
-	SAFE_SETEUID(NULL, ltpuser->pw_uid);
-
-	TEST_PAUSE;

-	tst_tmpdir();
+	if (ltpuser == NULL)
+		tst_brk(TBROK | TERRNO, "getpwnam failed");
+	SAFE_SETEUID(ltpuser->pw_uid);

 	/*
 	 * Create a test file under temporary directory with specified
@@ -157,14 +60,18 @@ void setup(void)
 	 * uid/gid of guest user.
 	 */
 	if ((fd = open(TESTFILE, O_RDWR | O_CREAT, FILE_MODE)) == -1)
-		tst_brkm(TBROK | TERRNO, cleanup, "open failed");
+		tst_brk(TBROK | TERRNO, "open failed");
 }

 void cleanup(void)
 {
 	if (close(fd) == -1)
-		tst_resm(TWARN | TERRNO, "close failed");
-
-	tst_rmdir();
-
+		tst_res(TWARN | TERRNO, "close failed");
 }
+
+static struct tst_test test = {
+	.test_all = verify_fchmod,
+	.setup = setup,
+	.needs_tmpdir = 1,
+	.needs_root = 1,
+};
--
2.20.1




-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

[LTP] [PATCH 2/2] syscalls/fchmod_04: Convert to new API

[tangmeng]

Signed-off-by: tangmeng <tangmeng@uniontech.com>
---
 testcases/kernel/syscalls/fchmod/fchmod04.c | 185 +++++---------------
 1 file changed, 39 insertions(+), 146 deletions(-)

diff --git a/testcases/kernel/syscalls/fchmod/fchmod04.c b/testcases/kernel/syscalls/fchmod/fchmod04.c
index befaadb35..1d84b4424 100644
--- a/testcases/kernel/syscalls/fchmod/fchmod04.c
+++ b/testcases/kernel/syscalls/fchmod/fchmod04.c
@@ -1,190 +1,83 @@
 /*
- *
  *   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
  */

-/*
- * Test Name: fchmod04
+/*\
+ * [Description]
  *
- * Test Description:
- *  Verify that, fchmod(2) will succeed to change the mode of a directory
- *  and set the sticky bit on it if invoked by non-root (uid != 0) process
- *  with the following constraints,
+ * Verify that, fchmod(2) will succeed to change the mode of a directory
+ * and set the sticky bit on it if invoked by non-root (uid != 0) process
+ * with the following constraints,
  *	- the process is the owner of the directory.
  *	- the effective group ID or one of the supplementary group ID's of the
  *	  process is equal to the group ID of the directory.
- *
- * Expected Result:
- *  fchmod() should return value 0 on success and succeeds to set sticky bit
- *  on the specified directory.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Create temporary directory.
- *   Pause for SIGUSR1 if option specified.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	Log the errno and Issue a FAIL message.
- *   Otherwise,
- *   	Verify the Functionality of system call
- *      if successful,
- *      	Issue Functionality-Pass message.
- *      Otherwise,
- *		Issue Functionality-Fail message.
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory created.
- *
- * Usage:  <for command-line>
- *  fchmod04 [-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:
- *  This test should be run by 'non-super-user' only.
- *
  */

-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
 #include <pwd.h>
-
-#include "test.h"
-#include "safe_macros.h"
+#include <stdio.h>
 #include "fchmod.h"
+#include "tst_test.h"

 int fd;				/* file descriptor for test directory */
-char *TCID = "fchmod04";
-int TST_TOTAL = 1;
-
 char nobody_uid[] = "nobody";
 struct passwd *ltpuser;

-void setup();
-void cleanup();
-
-int main(int ac, char **av)
+static void verify_fchmod(void)
 {
 	struct stat stat_buf;	/* stat struct. */
-	int lc;
 	mode_t dir_mode;	/* mode permissions set on testdirectory */

-	tst_parse_opts(ac, av, NULL, NULL);
-
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		tst_count = 0;
-
-		/*
-		 * Call fchmod(2) with mode argument to
-		 * set sticky bit on TESTDIR
-		 */
-		TEST(fchmod(fd, PERMS));
-
-		if (TEST_RETURN == -1) {
-			tst_resm(TFAIL | TTERRNO, "fchmod failed");
-			continue;
-		}
-		if (fstat(fd, &stat_buf) == -1)
-			tst_brkm(TFAIL | TERRNO, cleanup,
-				 "fstat failed");
-		dir_mode = stat_buf.st_mode;
-
-		if ((dir_mode & PERMS) == PERMS)
-			tst_resm(TPASS, "Functionality of fchmod(%d, "
-				 "%#o) successful", fd, PERMS);
-		else
-			tst_resm(TFAIL, "%s: Incorrect modes 0%03o, "
-				 "Expected 0%03o",
-				 TESTDIR, dir_mode, PERMS);
-	}
-
-	cleanup();
-	tst_exit();
+	/*
+	 * Call fchmod(2) with mode argument to
+	 * set sticky bit on TESTDIR
+	 */
+	TST_EXP_PASS_SILENT(fchmod(fd, PERMS));
+
+	if (fstat(fd, &stat_buf) == -1)
+		tst_brk(TFAIL | TERRNO, "fstat failed");
+	dir_mode = stat_buf.st_mode;
+
+	if ((dir_mode & PERMS) == PERMS)
+		tst_res(TPASS, "Functionality of fchmod(%d, "
+			 "%#o) successful", fd, PERMS);
+	else
+		tst_res(TFAIL, "%s: Incorrect modes 0%03o, "
+			 "Expected 0%03o",
+			 TESTDIR, dir_mode, PERMS);
 }

-/*
- * void
- * setup() - performs all ONE TIME setup for this test.
- *  Create a temporary directory and cd to it.
- *  Create another test directory under temporary directory.
- *  Open the test directory for reading.
- */
-void setup(void)
+static void setup(void)
 {
-	tst_require_root();
-
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
 	/* Switch to nobody user for correct error code collection */
 	ltpuser = getpwnam(nobody_uid);
 	if (seteuid(ltpuser->pw_uid) == -1) {
-		tst_resm(TINFO, "seteuid failed to "
+		tst_res(TINFO, "seteuid failed to "
 			 "to set the effective uid to %d", ltpuser->pw_uid);
 		perror("seteuid");
 	}

-	TEST_PAUSE;
-
-	tst_tmpdir();
-
 	/*
 	 * Create a test directory under temporary directory with specified
 	 * mode permissios and open it for reading/writing.
 	 */
-	SAFE_MKDIR(cleanup, TESTDIR, DIR_MODE);
+	SAFE_MKDIR(TESTDIR, DIR_MODE);
 	if ((fd = open(TESTDIR, O_RDONLY)) == -1) {
-		tst_brkm(TBROK, cleanup,
+		tst_brk(TBROK,
 			 "open(%s, O_RDONLY) failed, errno=%d : %s",
 			 TESTDIR, errno, strerror(errno));
 	}
 }

-/*
- * void
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- *  Close the test directory opened during setup().
- *  Remove the test directory and temporary directory created in setup().
- */
-void cleanup(void)
+static void cleanup(void)
 {
-
 	/* Close the test directory opened during setup() */
-	SAFE_CLOSE(NULL, fd);
-
-	tst_rmdir();
-
+	SAFE_CLOSE(fd);
 }
+
+static struct tst_test test = {
+	.test_all = verify_fchmod,
+	.setup = setup,
+	.cleanup = cleanup,
+	.needs_tmpdir = 1,
+	.needs_root = 1,
+};
--
2.20.1




-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH 1/2] syscalls/fchmod_03: Convert to new API

[Cyril Hrubis]

Hi!
> +/*\
> + * [Description]
>   *
> - * Test Description:
> - *  Verify that, fchmod(2) will succeed to change the mode of a file
> - *  and set the sticky bit on it if invoked by non-root (uid != 0)
> - *  process with the following constraints,
> + * Verify that, fchmod(2) will succeed to change the mode of a file
> + * and set the sticky bit on it if invoked by non-root (uid != 0)
> + * process with the following constraints,
>   *	- the process is the owner of the file.
>   *	- the effective group ID or one of the supplementary group ID's of the
>   *	  process is equal to the group ID of the file.
> - *
> - * Expected Result:
> - *  fchmod() should return value 0 on success and succeeds to change
> - *  the mode of specified file, sets sticky bit on it.
> - *
> - * Algorithm:
> - *  Setup:
> - *   Setup signal handling.
> - *   Create temporary directory.
> - *   Pause for SIGUSR1 if option specified.
> - *
> - *  Test:
> - *   Loop if the proper options are given.
> - *   Execute system call
> - *   Check return code, if system call failed (return=-1)
> - *   	Log the errno and Issue a FAIL message.
> - *   Otherwise,
> - *   	Verify the Functionality of system call
> - *      if successful,
> - *      	Issue Functionality-Pass message.
> - *      Otherwise,
> - *		Issue Functionality-Fail message.
> - *  Cleanup:
> - *   Print errno log and/or timing stats if options given
> - *   Delete the temporary directory created.
> - *
> - * Usage:  <for command-line>
> - *  fchmod03 [-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:
> - *  This test should be run by 'non-super-user' only.
> - *
>   */
> 
> -#include <stdio.h>
> -#include <sys/types.h>
> -#include <sys/stat.h>
> -#include <fcntl.h>
> -#include <errno.h>
> -#include <string.h>
> -#include <signal.h>
>  #include <pwd.h>
> -
> -#include "test.h"
> -#include "safe_macros.h"
>  #include "fchmod.h"
> +#include "tst_test.h"
> 
>  int fd;				/* file descriptor for test file */
                                           ^
					   Useless comment, please
					   remove.
> -char *TCID = "fchmod03";
> -int TST_TOTAL = 1;
> -
>  char nobody_uid[] = "nobody";

These two variables should be static.

>  struct passwd *ltpuser;

This is not used outside setup() function so it should be variable local
to the test setup.

> -void setup();			/* Main setup function for the test */
> -void cleanup();			/* Main cleanup function for the test */
> -
> -int main(int ac, char **av)
> +static void verify_fchmod(void)
>  {
>  	struct stat stat_buf;	/* stat struct. */
> -	int lc;
>  	mode_t file_mode;	/* mode permissions set on testfile */

Useless comments.

> -	tst_parse_opts(ac, av, NULL, NULL);
> -
> -	setup();
> +	TST_EXP_PASS_SILENT(fchmod(fd, PERMS));
> 
> -	for (lc = 0; TEST_LOOPING(lc); lc++) {
> -
> -		tst_count = 0;
> -
> -		TEST(fchmod(fd, PERMS));
> -
> -		if (TEST_RETURN == -1) {
> -			tst_resm(TFAIL | TTERRNO, "fchmod failed");
> -			continue;
> -		}
> -		/*
> -		 * Get the file information using
> -		 * fstat(2).
> -		 */
> -		if (fstat(fd, &stat_buf) == -1)
> -			tst_brkm(TFAIL | TERRNO, cleanup,
> -				 "fstat failed");
> -		file_mode = stat_buf.st_mode;
> -
> -		/* Verify STICKY BIT set on testfile */
> -		if ((file_mode & PERMS) != PERMS)
> -			tst_resm(TFAIL, "%s: Incorrect modes 0%3o, "
> -				 "Expected 0777", TESTFILE, file_mode);
> -		else
> -			tst_resm(TPASS, "Functionality of fchmod(%d, "
> -				 "%#o) successful", fd, PERMS);
> -	}
> -
> -	cleanup();
> -	tst_exit();
> +	/*
> +	 * Get the file information using
> +	 * fstat(2).
> +	 */

Useless comment.

> +	if (fstat(fd, &stat_buf) == -1)
> +		tst_brk(TFAIL | TERRNO, "fstat failed");
> +	file_mode = stat_buf.st_mode;

SAFE_FSTAT()

> +	/* Verify STICKY BIT set on testfile */

Useless comment.

> +	if ((file_mode & PERMS) != PERMS)
> +		tst_res(TFAIL, "%s: Incorrect modes 0%3o, "
> +			 "Expected 0777", TESTFILE, file_mode);
> +	else
> +		tst_res(TPASS, "Functionality of fchmod(%d, "
> +			 "%#o) successful", fd, PERMS);
>  }
> 
>  void setup(void)

static

>  {
> -
> -	tst_sig(NOFORK, DEF_HANDLER, cleanup);
> -
> -	tst_require_root();
> -
>  	ltpuser = getpwnam(nobody_uid);
> -	if (ltpuser == NULL)
> -		tst_brkm(TBROK | TERRNO, NULL, "getpwnam failed");
> -	SAFE_SETEUID(NULL, ltpuser->pw_uid);
> -
> -	TEST_PAUSE;
> 
> -	tst_tmpdir();
> +	if (ltpuser == NULL)
> +		tst_brk(TBROK | TERRNO, "getpwnam failed");

SAFE_GETPWNAM()

> +	SAFE_SETEUID(ltpuser->pw_uid);
> 
>  	/*
>  	 * Create a test file under temporary directory with specified
> @@ -157,14 +60,18 @@ void setup(void)
>  	 * uid/gid of guest user.
>  	 */

Useless comment.

>  	if ((fd = open(TESTFILE, O_RDWR | O_CREAT, FILE_MODE)) == -1)
> -		tst_brkm(TBROK | TERRNO, cleanup, "open failed");
> +		tst_brk(TBROK | TERRNO, "open failed");

SAFE_OPEN()

>  }
> 
>  void cleanup(void)

and here as well.

>  {
>  	if (close(fd) == -1)
> -		tst_resm(TWARN | TERRNO, "close failed");
> -
> -	tst_rmdir();
> -
> +		tst_res(TWARN | TERRNO, "close failed");
>  }
> +
> +static struct tst_test test = {
> +	.test_all = verify_fchmod,
> +	.setup = setup,
> +	.needs_tmpdir = 1,
> +	.needs_root = 1,
> +};
> --
> 2.20.1
> 
> 
> 
> 
> -- 
> Mailing list info: https://lists.linux.it/listinfo/ltp

-- 
Cyril Hrubis
chrubis@suse.cz

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH 2/2] syscalls/fchmod_04: Convert to new API

[Cyril Hrubis]

Hi!
Same comments apply here as well.

Also please do not forget to run 'make check' in the test directory
before submitting.

-- 
Cyril Hrubis
chrubis@suse.cz

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH 1/2] syscalls/fchmod_03: Convert to new API

[tangmeng]

在 2022/1/28 23:30, Cyril Hrubis 写道:
> Hi!
>> +/*\
>> + * [Description]
>>    *
>> - * Test Description:
>> - *  Verify that, fchmod(2) will succeed to change the mode of a file
>> - *  and set the sticky bit on it if invoked by non-root (uid != 0)
>> - *  process with the following constraints,
>> + * Verify that, fchmod(2) will succeed to change the mode of a file
>> + * and set the sticky bit on it if invoked by non-root (uid != 0)
>> + * process with the following constraints,
>>    *	- the process is the owner of the file.
>>    *	- the effective group ID or one of the supplementary group ID's of the
>>    *	  process is equal to the group ID of the file.
>> - *
>> - * Expected Result:
>> - *  fchmod() should return value 0 on success and succeeds to change
>> - *  the mode of specified file, sets sticky bit on it.
>> - *
>> - * Algorithm:
>> - *  Setup:
>> - *   Setup signal handling.
>> - *   Create temporary directory.
>> - *   Pause for SIGUSR1 if option specified.
>> - *
>> - *  Test:
>> - *   Loop if the proper options are given.
>> - *   Execute system call
>> - *   Check return code, if system call failed (return=-1)
>> - *   	Log the errno and Issue a FAIL message.
>> - *   Otherwise,
>> - *   	Verify the Functionality of system call
>> - *      if successful,
>> - *      	Issue Functionality-Pass message.
>> - *      Otherwise,
>> - *		Issue Functionality-Fail message.
>> - *  Cleanup:
>> - *   Print errno log and/or timing stats if options given
>> - *   Delete the temporary directory created.
>> - *
>> - * Usage:  <for command-line>
>> - *  fchmod03 [-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:
>> - *  This test should be run by 'non-super-user' only.
>> - *
>>    */
>>
>> -#include <stdio.h>
>> -#include <sys/types.h>
>> -#include <sys/stat.h>
>> -#include <fcntl.h>
>> -#include <errno.h>
>> -#include <string.h>
>> -#include <signal.h>
>>   #include <pwd.h>
>> -
>> -#include "test.h"
>> -#include "safe_macros.h"
>>   #include "fchmod.h"
>> +#include "tst_test.h"
>>
>>   int fd;				/* file descriptor for test file */
>                                             ^
> 					   Useless comment, please
> 					   remove.
>> -char *TCID = "fchmod03";
>> -int TST_TOTAL = 1;
>> -
>>   char nobody_uid[] = "nobody";
> 
> These two variables should be static.
> 
>>   struct passwd *ltpuser;
> 
> This is not used outside setup() function so it should be variable local
> to the test setup.
> 
>> -void setup();			/* Main setup function for the test */
>> -void cleanup();			/* Main cleanup function for the test */
>> -
>> -int main(int ac, char **av)
>> +static void verify_fchmod(void)
>>   {
>>   	struct stat stat_buf;	/* stat struct. */
>> -	int lc;
>>   	mode_t file_mode;	/* mode permissions set on testfile */
> 
> Useless comments.
> 
>> -	tst_parse_opts(ac, av, NULL, NULL);
>> -
>> -	setup();
>> +	TST_EXP_PASS_SILENT(fchmod(fd, PERMS));
>>
>> -	for (lc = 0; TEST_LOOPING(lc); lc++) {
>> -
>> -		tst_count = 0;
>> -
>> -		TEST(fchmod(fd, PERMS));
>> -
>> -		if (TEST_RETURN == -1) {
>> -			tst_resm(TFAIL | TTERRNO, "fchmod failed");
>> -			continue;
>> -		}
>> -		/*
>> -		 * Get the file information using
>> -		 * fstat(2).
>> -		 */
>> -		if (fstat(fd, &stat_buf) == -1)
>> -			tst_brkm(TFAIL | TERRNO, cleanup,
>> -				 "fstat failed");
>> -		file_mode = stat_buf.st_mode;
>> -
>> -		/* Verify STICKY BIT set on testfile */
>> -		if ((file_mode & PERMS) != PERMS)
>> -			tst_resm(TFAIL, "%s: Incorrect modes 0%3o, "
>> -				 "Expected 0777", TESTFILE, file_mode);
>> -		else
>> -			tst_resm(TPASS, "Functionality of fchmod(%d, "
>> -				 "%#o) successful", fd, PERMS);
>> -	}
>> -
>> -	cleanup();
>> -	tst_exit();
>> +	/*
>> +	 * Get the file information using
>> +	 * fstat(2).
>> +	 */
> 
> Useless comment.
> 
>> +	if (fstat(fd, &stat_buf) == -1)
>> +		tst_brk(TFAIL | TERRNO, "fstat failed");
>> +	file_mode = stat_buf.st_mode;
> 
> SAFE_FSTAT()
> 
>> +	/* Verify STICKY BIT set on testfile */
> 
> Useless comment.
> 
>> +	if ((file_mode & PERMS) != PERMS)
>> +		tst_res(TFAIL, "%s: Incorrect modes 0%3o, "
>> +			 "Expected 0777", TESTFILE, file_mode);
>> +	else
>> +		tst_res(TPASS, "Functionality of fchmod(%d, "
>> +			 "%#o) successful", fd, PERMS);
>>   }
>>
>>   void setup(void)
> 
> static
> 
>>   {
>> -
>> -	tst_sig(NOFORK, DEF_HANDLER, cleanup);
>> -
>> -	tst_require_root();
>> -
>>   	ltpuser = getpwnam(nobody_uid);
>> -	if (ltpuser == NULL)
>> -		tst_brkm(TBROK | TERRNO, NULL, "getpwnam failed");
>> -	SAFE_SETEUID(NULL, ltpuser->pw_uid);
>> -
>> -	TEST_PAUSE;
>>
>> -	tst_tmpdir();
>> +	if (ltpuser == NULL)
>> +		tst_brk(TBROK | TERRNO, "getpwnam failed");
> 
> SAFE_GETPWNAM()
> 
>> +	SAFE_SETEUID(ltpuser->pw_uid);
>>
>>   	/*
>>   	 * Create a test file under temporary directory with specified
>> @@ -157,14 +60,18 @@ void setup(void)
>>   	 * uid/gid of guest user.
>>   	 */
> 
> Useless comment.
> 
>>   	if ((fd = open(TESTFILE, O_RDWR | O_CREAT, FILE_MODE)) == -1)
>> -		tst_brkm(TBROK | TERRNO, cleanup, "open failed");
>> +		tst_brk(TBROK | TERRNO, "open failed");
> 
> SAFE_OPEN()
> 
>>   }
>>
>>   void cleanup(void)
> 
> and here as well.
> 
>>   {
>>   	if (close(fd) == -1)
>> -		tst_resm(TWARN | TERRNO, "close failed");
>> -
>> -	tst_rmdir();
>> -
>> +		tst_res(TWARN | TERRNO, "close failed");
>>   }
>> +
>> +static struct tst_test test = {
>> +	.test_all = verify_fchmod,
>> +	.setup = setup,
>> +	.needs_tmpdir = 1,
>> +	.needs_root = 1,
>> +};
>> --
>> 2.20.1
>>
>>
>>
>>
>> -- 
>> Mailing list info: https://lists.linux.it/listinfo/ltp
> 

Thanks for the heads up! I have handled it in patch v2.

And I fixed the formatting issue in fchmod06.c found when running ’make 
check’

Best regards



-- 
Mailing list info: https://lists.linux.it/listinfo/ltp