[LTP] [PATCH] [4/6] syscalls/sysfs: Convert sysfs04 to the new API

[LTP] [PATCH] [4/6] syscalls/sysfs: Convert sysfs04 to the new API

[sujiaxun]

Signed-off-by: sujiaxun <sujiaxun@uniontech.com>
---
 testcases/kernel/syscalls/sysfs/sysfs04.c | 140 ++++------------------
 1 file changed, 24 insertions(+), 116 deletions(-)

diff --git a/testcases/kernel/syscalls/sysfs/sysfs04.c b/testcases/kernel/syscalls/sysfs/sysfs04.c
index 6356a89c8..64b1eaf8c 100644
--- a/testcases/kernel/syscalls/sysfs/sysfs04.c
+++ b/testcases/kernel/syscalls/sysfs/sysfs04.c
@@ -1,129 +1,37 @@
+// 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	: sysfs04
- *
- *
- *    EXECUTED BY	: anyone
- *
- *    TEST TITLE	: Test checking for basic error conditions
- *				 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 test case checks whether sysfs(2) system call  returns
- *	appropriate error number for invalid
- *	option.
- *
- *	Setup:
- *	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- *
- *	Test:
- *	  Loop if the proper options are given.
- *	  Execute system call with invaid  option parameter
- *
- *	  Check return code, if system call fails with errno == expected errno
- *		Issue syscall passed with expected errno
- *	  Otherwise,
- *	  Issue syscall failed to produce expected errno
- *
- *	Cleanup:
- *	  Do cleanup for the test.
- *
- * USAGE:  <for command-line>
- * sysfs04  [-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:
- *No libc or glibc support
- *****************************************************************************/
+
+/*
+ * [DESCRIPTION]
+ * This test case checks whether sysfs(2) system call returns
+ * appropriate error number for invalid option.
+ */

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

 #define INVALID_OPTION 100
-static void setup();
-static void cleanup();
-
-char *TCID = "sysfs04";
-int TST_TOTAL = 1;
-
-int main(int ac, char **av)
-{
-	int lc;
-
-	tst_parse_opts(ac, av, NULL, NULL);
-
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {

-		tst_count = 0;
-		TEST(ltp_syscall(__NR_sysfs, INVALID_OPTION));
-
-		/* check return code */
-		if ((TEST_RETURN == -1) && (TEST_ERRNO == EINVAL)) {
-			tst_resm(TPASS, "sysfs(2) expected failure;"
-				 " Got errno - EINVAL :" " Invalid option");
-		} else {
-			tst_resm(TFAIL, "sysfs(2) failed to produce"
-				 " expected error; %d, errno"
-				 " : EINVAL and got %d", EINVAL, TEST_ERRNO);
-		}
-	}
-
-	/*Clean up and exit */
-	cleanup();
-	tst_exit();
-
-}				/*End of main */
-
-/* setup() - performs all ONE TIME setup for this test */
-void setup(void)
+static void verify_sysfs04(void)
 {

-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	TEST_PAUSE;
+    TST_EXP_FAIL(tst_syscall(__NR_sysfs, INVALID_OPTION),
+				EINVAL,"sysfs(INVALID_OPTION)");
+
+    if (TST_PASS) {
+        tst_res(TPASS, "sysfs(2) expected failure;"
+             " Got errno - EINVAL :" " Invalid option");
+    } else {
+         tst_res(TFAIL, "sysfs(2) failed to produce"
+              " expected error; %d, errno"
+              " : EINVAL and got %d", EINVAL, TST_ERR);
+    }
 }

-/*
-* cleanup() - Performs one time cleanup for this test at
-* completion or premature exit
-*/
-void cleanup(void)
-{
-
-}
+static struct tst_test test = {
+    .test_all = verify_sysfs04
+};
--
2.20.1

[LTP] [PATCH] [4/6] syscalls/sysfs: Convert sysfs04 to the new API

[Cyril Hrubis]

Hi!
> +// 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 is another case of GPL-2.0 so please fix the 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	: sysfs04
> - *
> - *
> - *    EXECUTED BY	: anyone
> - *
> - *    TEST TITLE	: Test checking for basic error conditions
> - *				 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 test case checks whether sysfs(2) system call  returns
> - *	appropriate error number for invalid
> - *	option.
> - *
> - *	Setup:
> - *	  Setup signal handling.
> - *	  Pause for SIGUSR1 if option specified.
> - *
> - *	Test:
> - *	  Loop if the proper options are given.
> - *	  Execute system call with invaid  option parameter
> - *
> - *	  Check return code, if system call fails with errno == expected errno
> - *		Issue syscall passed with expected errno
> - *	  Otherwise,
> - *	  Issue syscall failed to produce expected errno
> - *
> - *	Cleanup:
> - *	  Do cleanup for the test.
> - *
> - * USAGE:  <for command-line>
> - * sysfs04  [-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:
> - *No libc or glibc support
> - *****************************************************************************/
> +
> +/*
> + * [DESCRIPTION]

Should be [Description] and also the special documentation comment has
to start with /*\

> + * This test case checks whether sysfs(2) system call returns
> + * appropriate error number for invalid option.
> + */
> 
>  #include <errno.h>
> -#include  <sys/syscall.h>
> -#include "test.h"
> +#include <sys/syscall.h>
> +#include "tst_test.h"
>  #include "lapi/syscalls.h"
> 
>  #define INVALID_OPTION 100
> -static void setup();
> -static void cleanup();
> -
> -char *TCID = "sysfs04";
> -int TST_TOTAL = 1;
> -
> -int main(int ac, char **av)
> -{
> -	int lc;
> -
> -	tst_parse_opts(ac, av, NULL, NULL);
> -
> -	setup();
> -
> -	for (lc = 0; TEST_LOOPING(lc); lc++) {
> 
> -		tst_count = 0;
> -		TEST(ltp_syscall(__NR_sysfs, INVALID_OPTION));
> -
> -		/* check return code */
> -		if ((TEST_RETURN == -1) && (TEST_ERRNO == EINVAL)) {
> -			tst_resm(TPASS, "sysfs(2) expected failure;"
> -				 " Got errno - EINVAL :" " Invalid option");
> -		} else {
> -			tst_resm(TFAIL, "sysfs(2) failed to produce"
> -				 " expected error; %d, errno"
> -				 " : EINVAL and got %d", EINVAL, TEST_ERRNO);
> -		}
> -	}
> -
> -	/*Clean up and exit */
> -	cleanup();
> -	tst_exit();
> -
> -}				/*End of main */
> -
> -/* setup() - performs all ONE TIME setup for this test */
> -void setup(void)
> +static void verify_sysfs04(void)
>  {
> 
> -	tst_sig(NOFORK, DEF_HANDLER, cleanup);
> -
> -	TEST_PAUSE;
> +    TST_EXP_FAIL(tst_syscall(__NR_sysfs, INVALID_OPTION),
> +				EINVAL,"sysfs(INVALID_OPTION)");
> +
> +    if (TST_PASS) {
> +        tst_res(TPASS, "sysfs(2) expected failure;"
> +             " Got errno - EINVAL :" " Invalid option");
> +    } else {
> +         tst_res(TFAIL, "sysfs(2) failed to produce"
> +              " expected error; %d, errno"
> +              " : EINVAL and got %d", EINVAL, TST_ERR);
> +    }

The TST_EXP_FAIL() _does_ print the pass/fail messages for you, there is
absolutelly no reason to print them manually.

>  }
> 
> -/*
> -* cleanup() - Performs one time cleanup for this test at
> -* completion or premature exit
> -*/
> -void cleanup(void)
> -{
> -
> -}
> +static struct tst_test test = {
> +    .test_all = verify_sysfs04
> +};
> --
> 2.20.1
> 
> 
> 
> 
> -- 
> Mailing list info: https://lists.linux.it/listinfo/ltp

-- 
Cyril Hrubis
chrubis@suse.cz