[LTP] [PATCH] [v2, 1/6] syscalls/sysfs: Convert sysfs01 to the new API

[LTP] [PATCH] [v2, 1/6] syscalls/sysfs: Convert sysfs01 to the new API

[sujiaxun]

Signed-off-by: sujiaxun <sujiaxun@uniontech.com>
---
 testcases/kernel/syscalls/sysfs/sysfs01.c | 132 +++-------------------
 1 file changed, 17 insertions(+), 115 deletions(-)

diff --git a/testcases/kernel/syscalls/sysfs/sysfs01.c b/testcases/kernel/syscalls/sysfs/sysfs01.c
index 85052dc2b..35195e95f 100644
--- a/testcases/kernel/syscalls/sysfs/sysfs01.c
+++ b/testcases/kernel/syscalls/sysfs/sysfs01.c
@@ -1,129 +1,31 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (c) Wipro Technologies Ltd, 2002.  All Rights Reserved.
- *
- * 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.
- *
  */
-/**************************************************************************
- *
- *    TEST IDENTIFIER	: sysfs01
- *
- *    EXECUTED BY	: anyone
- *
- *    TEST TITLE	: Basic test for sysfs(2)
- *
- *    TEST CASE TOTAL	: 1
- *
- *    AUTHOR		: Aniruddha Marathe <aniruddha.marathe@wipro.com>
- *
- *    SIGNALS
- *	Uses SIGUSR1 to pause before test if option set.
- *	(See the parse_opts(3) man page).
- *
- *    DESCRIPTION
- *    This is a Phase I test for the sysfs(2) system call.
- *    This test is carried out for option 1 for sysfs(2).
- *    It is intended to provide a limited exposure of the system call.
- *
- *
- *	Setup:
- *	  Setup signal handling.
- *	  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, Issue a PASS message.
- *
- *	Cleanup:
- *	  Print errno log and/or timing stats if options given
- *
- * USAGE:  <for command-line>
- * sysfs01 [-c n]  [-e] [-i n] [-I x] [-p x] [-t] [-h] [-f] [-p]
- *  where:
- *	-c n : run n copies simultaneously.
- *	-e   : Turn on errno logging.
- *	-i n : Execute test n times.
- *	-I x : Execute test for x seconds.
- *	-p   : Pause for SIGUSR1 before starting
- *	-P x : Pause for x seconds between iterations.
- *	-t   : Turn on syscall timing.
- *
- *RESTRICTIONS:
- *There is no glibc or libc support
- *Kernel should be compiled with proc filesystem support
- ******************************************************************************/
+
+/*
+ * [DESCRIPTION]
+ * This test is run for option 1 for sysfs(2).
+ * Translate the filesystem identifier string fsname into a filesystem type index.
+ */

 #include <errno.h>
 #include <unistd.h>
 #include <sys/syscall.h>
-#include "test.h"
+#include "tst_test.h"
 #include "lapi/syscalls.h"

-static void setup();
-static void cleanup();
-
-char *TCID = "sysfs01";
-int TST_TOTAL = 1;
-
-int main(int ac, char **av)
+static void verify_sysfs01(void)
 {
-	int lc;
-
-	tst_parse_opts(ac, av, NULL, NULL);
-
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		tst_count = 0;
-
-		/* option 1, buf holds fs name */
-		TEST(ltp_syscall(__NR_sysfs, 1, "proc"));
-
-		/* check return code */
-		if (TEST_RETURN == -1) {
-			tst_resm(TFAIL, "sysfs(2) Failed for "
-				 "option 1 and set errno to %d", TEST_ERRNO);
-		} else {
-			tst_resm(TPASS, "sysfs(2) Passed for " "option 1");
-		}
-	}			/*End of TEST_LOOPING */
-
-	/*Clean up and exit */
-	cleanup();
-	tst_exit();
+        /* option 1, buf holds fs name */
+        TST_EXP_POSITIVE(tst_syscall(__NR_sysfs, 1, "proc"),
+                        "sysfs(1,'proc')");

+        if (TST_PASS == 1)
+            tst_res(TPASS, "sysfs(2) Passed for " "option 1");
 }

-/* setup() - performs all ONE TIME setup for this test */
-void setup(void)
-{
-
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	TEST_PAUSE;
+static struct tst_test test = {
+    .test_all = verify_sysfs01,
+};

-}
-
-/*
- * cleanup() - Performs one time cleanup for this test at
- * completion or premature exit
- */
-
-void cleanup(void)
-{
-
-}
--
2.20.1

[LTP] [PATCH] [v2, 1/6] syscalls/sysfs: Convert sysfs01 to the new API

[Cyril Hrubis]

Hi!
> diff --git a/testcases/kernel/syscalls/sysfs/sysfs01.c b/testcases/kernel/syscalls/sysfs/sysfs01.c
> index 85052dc2b..35195e95f 100644
> --- a/testcases/kernel/syscalls/sysfs/sysfs01.c
> +++ b/testcases/kernel/syscalls/sysfs/sysfs01.c
> @@ -1,129 +1,31 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
>   * Copyright (c) Wipro Technologies Ltd, 2002.  All Rights Reserved.
> - *
> - * 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.

Note that the original is GPL-2.0 not GPL-2.0-or-later. Please stick to
the original licence when replacing the old text with SPDX identifier.

> - * 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.
> - *
>   */
> -/**************************************************************************
> - *
> - *    TEST IDENTIFIER	: sysfs01
> - *
> - *    EXECUTED BY	: anyone
> - *
> - *    TEST TITLE	: Basic test for sysfs(2)
> - *
> - *    TEST CASE TOTAL	: 1
> - *
> - *    AUTHOR		: Aniruddha Marathe <aniruddha.marathe@wipro.com>
> - *
> - *    SIGNALS
> - *	Uses SIGUSR1 to pause before test if option set.
> - *	(See the parse_opts(3) man page).
> - *
> - *    DESCRIPTION
> - *    This is a Phase I test for the sysfs(2) system call.
> - *    This test is carried out for option 1 for sysfs(2).
> - *    It is intended to provide a limited exposure of the system call.
> - *
> - *
> - *	Setup:
> - *	  Setup signal handling.
> - *	  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, Issue a PASS message.
> - *
> - *	Cleanup:
> - *	  Print errno log and/or timing stats if options given
> - *
> - * USAGE:  <for command-line>
> - * sysfs01 [-c n]  [-e] [-i n] [-I x] [-p x] [-t] [-h] [-f] [-p]
> - *  where:
> - *	-c n : run n copies simultaneously.
> - *	-e   : Turn on errno logging.
> - *	-i n : Execute test n times.
> - *	-I x : Execute test for x seconds.
> - *	-p   : Pause for SIGUSR1 before starting
> - *	-P x : Pause for x seconds between iterations.
> - *	-t   : Turn on syscall timing.
> - *
> - *RESTRICTIONS:
> - *There is no glibc or libc support
> - *Kernel should be compiled with proc filesystem support
> - ******************************************************************************/
> +
> +/*
> + * [DESCRIPTION]

This should be [Description]

> + * This test is run for option 1 for sysfs(2).
> + * Translate the filesystem identifier string fsname into a filesystem type index.
> + */
> 
>  #include <errno.h>
>  #include <unistd.h>
>  #include <sys/syscall.h>
> -#include "test.h"
> +#include "tst_test.h"
>  #include "lapi/syscalls.h"
> 
> -static void setup();
> -static void cleanup();
> -
> -char *TCID = "sysfs01";
> -int TST_TOTAL = 1;
> -
> -int main(int ac, char **av)
> +static void verify_sysfs01(void)
>  {
> -	int lc;
> -
> -	tst_parse_opts(ac, av, NULL, NULL);
> -
> -	setup();
> -
> -	for (lc = 0; TEST_LOOPING(lc); lc++) {
> -
> -		tst_count = 0;
> -
> -		/* option 1, buf holds fs name */
> -		TEST(ltp_syscall(__NR_sysfs, 1, "proc"));
> -
> -		/* check return code */
> -		if (TEST_RETURN == -1) {
> -			tst_resm(TFAIL, "sysfs(2) Failed for "
> -				 "option 1 and set errno to %d", TEST_ERRNO);
> -		} else {
> -			tst_resm(TPASS, "sysfs(2) Passed for " "option 1");
> -		}
> -	}			/*End of TEST_LOOPING */
> -
> -	/*Clean up and exit */
> -	cleanup();
> -	tst_exit();
> +        /* option 1, buf holds fs name */
> +        TST_EXP_POSITIVE(tst_syscall(__NR_sysfs, 1, "proc"),
> +                        "sysfs(1,'proc')");
> 
> +        if (TST_PASS == 1)
> +            tst_res(TPASS, "sysfs(2) Passed for " "option 1");
>  }
> 
> -/* setup() - performs all ONE TIME setup for this test */
> -void setup(void)
> -{
> -
> -	tst_sig(NOFORK, DEF_HANDLER, cleanup);
> -
> -	TEST_PAUSE;
> +static struct tst_test test = {
> +    .test_all = verify_sysfs01,
> +};

There whitespaces are wrong here, you really should use checkpatch.pl
to check for common problems before sending a patchset.

It's a good idea to go over contribution checklist as well:

https://github.com/linux-test-project/ltp/wiki/Test-Writing-Guidelines#6-test-contribution-checklist

-- 
Cyril Hrubis
chrubis@suse.cz

[LTP] [PATCH] [v2, 1/6] syscalls/sysfs: Convert sysfs01 to the new API

[sujiaxun]

Hi!
I checked with "checkpatch.pl -f" and there were no errors or warnings. 
I use "git am" to apply the patch normally without any warning. How did 
you check that there are spaces.

? 2021/8/10 ??5:55, Cyril Hrubis ??:
> Hi!
>> diff --git a/testcases/kernel/syscalls/sysfs/sysfs01.c b/testcases/kernel/syscalls/sysfs/sysfs01.c
>> index 85052dc2b..35195e95f 100644
>> --- a/testcases/kernel/syscalls/sysfs/sysfs01.c
>> +++ b/testcases/kernel/syscalls/sysfs/sysfs01.c
>> @@ -1,129 +1,31 @@
>> +// SPDX-License-Identifier: GPL-2.0-or-later
>>   /*
>>    * Copyright (c) Wipro Technologies Ltd, 2002.  All Rights Reserved.
>> - *
>> - * 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.
> 
> Note that the original is GPL-2.0 not GPL-2.0-or-later. Please stick to
> the original licence when replacing the old text with SPDX identifier.
> 
>> - * 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.
>> - *
>>    */
>> -/**************************************************************************
>> - *
>> - *    TEST IDENTIFIER	: sysfs01
>> - *
>> - *    EXECUTED BY	: anyone
>> - *
>> - *    TEST TITLE	: Basic test for sysfs(2)
>> - *
>> - *    TEST CASE TOTAL	: 1
>> - *
>> - *    AUTHOR		: Aniruddha Marathe <aniruddha.marathe@wipro.com>
>> - *
>> - *    SIGNALS
>> - *	Uses SIGUSR1 to pause before test if option set.
>> - *	(See the parse_opts(3) man page).
>> - *
>> - *    DESCRIPTION
>> - *    This is a Phase I test for the sysfs(2) system call.
>> - *    This test is carried out for option 1 for sysfs(2).
>> - *    It is intended to provide a limited exposure of the system call.
>> - *
>> - *
>> - *	Setup:
>> - *	  Setup signal handling.
>> - *	  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, Issue a PASS message.
>> - *
>> - *	Cleanup:
>> - *	  Print errno log and/or timing stats if options given
>> - *
>> - * USAGE:  <for command-line>
>> - * sysfs01 [-c n]  [-e] [-i n] [-I x] [-p x] [-t] [-h] [-f] [-p]
>> - *  where:
>> - *	-c n : run n copies simultaneously.
>> - *	-e   : Turn on errno logging.
>> - *	-i n : Execute test n times.
>> - *	-I x : Execute test for x seconds.
>> - *	-p   : Pause for SIGUSR1 before starting
>> - *	-P x : Pause for x seconds between iterations.
>> - *	-t   : Turn on syscall timing.
>> - *
>> - *RESTRICTIONS:
>> - *There is no glibc or libc support
>> - *Kernel should be compiled with proc filesystem support
>> - ******************************************************************************/
>> +
>> +/*
>> + * [DESCRIPTION]
> 
> This should be [Description]
> 
>> + * This test is run for option 1 for sysfs(2).
>> + * Translate the filesystem identifier string fsname into a filesystem type index.
>> + */
>>
>>   #include <errno.h>
>>   #include <unistd.h>
>>   #include <sys/syscall.h>
>> -#include "test.h"
>> +#include "tst_test.h"
>>   #include "lapi/syscalls.h"
>>
>> -static void setup();
>> -static void cleanup();
>> -
>> -char *TCID = "sysfs01";
>> -int TST_TOTAL = 1;
>> -
>> -int main(int ac, char **av)
>> +static void verify_sysfs01(void)
>>   {
>> -	int lc;
>> -
>> -	tst_parse_opts(ac, av, NULL, NULL);
>> -
>> -	setup();
>> -
>> -	for (lc = 0; TEST_LOOPING(lc); lc++) {
>> -
>> -		tst_count = 0;
>> -
>> -		/* option 1, buf holds fs name */
>> -		TEST(ltp_syscall(__NR_sysfs, 1, "proc"));
>> -
>> -		/* check return code */
>> -		if (TEST_RETURN == -1) {
>> -			tst_resm(TFAIL, "sysfs(2) Failed for "
>> -				 "option 1 and set errno to %d", TEST_ERRNO);
>> -		} else {
>> -			tst_resm(TPASS, "sysfs(2) Passed for " "option 1");
>> -		}
>> -	}			/*End of TEST_LOOPING */
>> -
>> -	/*Clean up and exit */
>> -	cleanup();
>> -	tst_exit();
>> +        /* option 1, buf holds fs name */
>> +        TST_EXP_POSITIVE(tst_syscall(__NR_sysfs, 1, "proc"),
>> +                        "sysfs(1,'proc')");
>>
>> +        if (TST_PASS == 1)
>> +            tst_res(TPASS, "sysfs(2) Passed for " "option 1");
>>   }
>>
>> -/* setup() - performs all ONE TIME setup for this test */
>> -void setup(void)
>> -{
>> -
>> -	tst_sig(NOFORK, DEF_HANDLER, cleanup);
>> -
>> -	TEST_PAUSE;
>> +static struct tst_test test = {
>> +    .test_all = verify_sysfs01,
>> +};
> 
> There whitespaces are wrong here, you really should use checkpatch.pl
> to check for common problems before sending a patchset.
> 
> It's a good idea to go over contribution checklist as well:
> 
> https://github.com/linux-test-project/ltp/wiki/Test-Writing-Guidelines#6-test-contribution-checklist
> 

-- 
Kind regards,

sujiaxun

[LTP] [PATCH] [v2, 1/6] syscalls/sysfs: Convert sysfs01 to the new API

[Cyril Hrubis]

Hi!
> I checked with "checkpatch.pl -f" and there were no errors or warnings. 
> I use "git am" to apply the patch normally without any warning. How did 
> you check that there are spaces.

Have you used recent enough version?

Latest kernel git:

$ ~/linux/scripts/checkpatch.pl -f sysfs01.c

ERROR: code indent should use tabs where possible
#20: FILE: sysfs01.c:20:
+        /* option 1, buf holds fs name */$

ERROR: code indent should use tabs where possible
#21: FILE: sysfs01.c:21:
+        TST_EXP_POSITIVE(tst_syscall(__NR_sysfs, 1, "proc"),$

WARNING: please, no spaces at the start of a line
#21: FILE: sysfs01.c:21:
+        TST_EXP_POSITIVE(tst_syscall(__NR_sysfs, 1, "proc"),$

ERROR: code indent should use tabs where possible
#22: FILE: sysfs01.c:22:
+                        "sysfs(1,'proc')");$

WARNING: please, no spaces at the start of a line
#22: FILE: sysfs01.c:22:

...


$ cd ~/linux/; git describe

v5.14-rc5-2-g9a73fa375d58

-- 
Cyril Hrubis
chrubis@suse.cz

[LTP] [PATCH] [v2, 1/6] syscalls/sysfs: Convert sysfs01 to the new API

[sujiaxun]

? 2021/8/10 ??9:54, Cyril Hrubis ??:
> Hi!
>> I checked with "checkpatch.pl -f" and there were no errors or warnings.
>> I use "git am" to apply the patch normally without any warning. How did
>> you check that there are spaces.
> 
> Have you used recent enough version?
> 
> Latest kernel git:
> 
> $ ~/linux/scripts/checkpatch.pl -f sysfs01.c
> 
> ERROR: code indent should use tabs where possible
> #20: FILE: sysfs01.c:20:
> +        /* option 1, buf holds fs name */$
> 
> ERROR: code indent should use tabs where possible
> #21: FILE: sysfs01.c:21:
> +        TST_EXP_POSITIVE(tst_syscall(__NR_sysfs, 1, "proc"),$
> 
> WARNING: please, no spaces at the start of a line
> #21: FILE: sysfs01.c:21:
> +        TST_EXP_POSITIVE(tst_syscall(__NR_sysfs, 1, "proc"),$
> 
> ERROR: code indent should use tabs where possible
> #22: FILE: sysfs01.c:22:
> +                        "sysfs(1,'proc')");$
> 
> WARNING: please, no spaces at the start of a line
> #22: FILE: sysfs01.c:22:
> 
> ...
> 
> 
> $ cd ~/linux/; git describe
> 
> v5.14-rc5-2-g9a73fa375d58
> 
Thank you, the kernel version I use is v4.19.90. But it may have nothing 
to do with the version. I only use "checkpatch.pl -f X.patch" instead of 
"checkpatch.pl -f sysfs01.c". I have revised the check again and will 
resubmit.
-- 
Kind regards,

sujiaxun