Skip to contentSkip to conversation

syscalls/times01: Convert to new API

PATCH New Shiyang Ruan 2 participants 4 messages Jan 27, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 syscalls/times01: Convert to new API

---
 testcases/kernel/syscalls/times/times01.c | 168 +++-------------------
 1 file changed, 20 insertions(+), 148 deletions(-)
testcases/kernel/syscalls/times/times01.c +20 -148
index 293a52957..87a0f6144 100644
@@ -1,162 +1,34 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (c) 2000 Silicon Graphics, Inc.  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.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * 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.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id: times01.c,v 1.6 2009/10/26 14:55:48 subrata_modak Exp $ */
-/**********************************************************
- *
- *    OS Test - Silicon Graphics, Inc.
- *
- *    TEST IDENTIFIER	: times01
- *
- *    EXECUTED BY	: anyone
- *
- *    TEST TITLE	: Basic test for times(2)
- *
- *    PARENT DOCUMENT	: usctpl01
- *
- *    TEST CASE TOTAL	: 1
- *
- *    WALL CLOCK TIME	: 1
- *
- *    CPU TYPES		: ALL
- *
- *    AUTHOR		: William Roske
- *
- *    CO-PILOT		: Dave Fenner
- *
- *    DATE STARTED	: 03/30/92
- *
- *    INITIAL RELEASE	: UNICOS 7.0
- *
- *    TEST CASES
- *
- * 	1.) times(2) returns...(See Description)
- *
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- *
- *    OUTPUT SPECIFICATIONS
- *$
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- *
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- *
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- *
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- *
- *    INTERCASE DEPENDENCIES
- * 	None
- *
- *    DETAILED DESCRIPTION
+ * DESCRIPTION
  *	This is a Phase I test for the times(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	times(2).
- *
- * 	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.
+ *	to provide a limited exposure of the system call.
  *
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- *
- *
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
+ * ALGORITHM:
+ *	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.
+ */
 
-#include <sys/types.h>
 #include <sys/times.h>
 #include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-
-void setup();
-void cleanup();
-
-char *TCID = "times01";
-int TST_TOTAL = 1;
-
-struct tms mytimes;
+#include "tst_test.h"
 
-int main(int ac, char **av)
+static void verify_times(void)
 {
-	int lc;
+	struct tms mytimes;
 
-	tst_parse_opts(ac, av, NULL, NULL);
+	TEST(times(&mytimes));
 
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		tst_count = 0;
-
-		TEST(times(&mytimes));
-
-		if (TEST_RETURN == -1)
-			tst_resm(TFAIL | TTERRNO, "times failed");
-		else
-			tst_resm(TPASS, "times(&mytimes) returned %ld",
-				 TEST_RETURN);
-
-	}
-
-	cleanup();
-	tst_exit();
+	if (TST_RET == -1)
+		tst_res(TFAIL | TTERRNO, "times failed");
+	else
+		tst_res(TPASS, "times(&mytimes) returned %ld", TST_RET);
 }
 
-void setup(void)
-{
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	TEST_PAUSE;
-}
-
-void cleanup(void)
-{
-}
+static struct tst_test test = {
+	.test_all = verify_times,
+};
Signature · 1 line
2.30.0
#1 lore raw

PATCH 1/1 syscalls/times01: Convert to new API

Quoted 110 lines · Shiyang Ruan
---
  testcases/kernel/syscalls/times/times01.c | 168 +++-------------------
  1 file changed, 20 insertions(+), 148 deletions(-)
testcases/kernel/syscalls/times/times01.c +2 -94
index 293a52957..87a0f6144 100644
@@ -1,162 +1,34 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
  /*
   * Copyright (c) 2000 Silicon Graphics, Inc.  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.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * 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.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id: times01.c,v 1.6 2009/10/26 14:55:48 subrata_modak Exp $ */
-/**********************************************************
- *
- *    OS Test - Silicon Graphics, Inc.
- *
- *    TEST IDENTIFIER	: times01
- *
- *    EXECUTED BY	: anyone
- *
- *    TEST TITLE	: Basic test for times(2)
- *
- *    PARENT DOCUMENT	: usctpl01
- *
- *    TEST CASE TOTAL	: 1
- *
- *    WALL CLOCK TIME	: 1
- *
- *    CPU TYPES		: ALL
- *
- *    AUTHOR		: William Roske
- *
- *    CO-PILOT		: Dave Fenner
- *
- *    DATE STARTED	: 03/30/92
- *
- *    INITIAL RELEASE	: UNICOS 7.0
- *
- *    TEST CASES
- *
- * 	1.) times(2) returns...(See Description)
- *
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- *
- *    OUTPUT SPECIFICATIONS
- *$
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- *
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- *
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- *
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- *
- *    INTERCASE DEPENDENCIES
- * 	None
- *
- *    DETAILED DESCRIPTION
+ * DESCRIPTION
   *	This is a Phase I test for the times(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	times(2).
- *
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- *

testcases/kernel/syscalls/times/times01.c line 107

Quoted 10 lines
testcases/kernel/syscalls/times/times01.c +1 -8
- * 	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.
+ *	to provide a limited exposure of the system call.
   *
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given

Hi Ruan,

Please use the following format of description comment so that it can be picked up by docparser:
--------------------------------------
/*\
* [DESCRIPTION]
...
\*/
--------------------------------------

testcases/kernel/syscalls/times/times01.c line 14

Quoted 9 lines
testcases/kernel/syscalls/times/times01.c +6 -3
- *
- *
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
+ * ALGORITHM:
+ *	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.
+ */

This test is very easy so remove the algorithm comment directly.

Quoted 38 lines
testcases/kernel/syscalls/times/times01.c +4 -27
-#include<sys/types.h>
  #include<sys/times.h>
  #include<errno.h>
-#include<string.h>
-#include<signal.h>
-#include "test.h"
-
-void setup();
-void cleanup();
-
-char *TCID = "times01";
-int TST_TOTAL = 1;
-
-struct tms mytimes;
+#include "tst_test.h"
 
-int main(int ac, char **av)
+static void verify_times(void)
  {
-	int lc;
+	struct tms mytimes;
 
-	tst_parse_opts(ac, av, NULL, NULL);
+	TEST(times(&mytimes));
 
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		tst_count = 0;
-
-		TEST(times(&mytimes));
-
-		if (TEST_RETURN == -1)
-			tst_resm(TFAIL | TTERRNO, "times failed");
-		else
-			tst_resm(TPASS, "times(&mytimes) returned %ld",

testcases/kernel/syscalls/times/times01.c line 29

Quoted 10 lines
testcases/kernel/syscalls/times/times01.c +4 -6
-				 TEST_RETURN);
-
-	}
-
-	cleanup();
-	tst_exit();
+	if (TST_RET == -1)
+		tst_res(TFAIL | TTERRNO, "times failed");
+	else
+		tst_res(TPASS, "times(&mytimes) returned %ld", TST_RET);

It is simpler to use TST_EXP_PASS() here (replace TEST()).

Best Regards,
Xiao Yang

Quoted 15 lines
testcases/kernel/syscalls/times/times01.c +3 -10
  }
 
-void setup(void)
-{
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	TEST_PAUSE;
-}
-
-void cleanup(void)
-{
-}
+static struct tst_test test = {
+	.test_all = verify_times,
+};
#2 lore raw

PATCH 1/1 syscalls/times01: Convert to new API

Quoted 191 lines · Xiao Yang
Quoted 117 lines · Shiyang Ruan

---
? testcases/kernel/syscalls/times/times01.c | 168 +++------------------- ? 1 file changed, 20 insertions(+), 148 deletions(-)

testcases/kernel/syscalls/times/times01.c +1 -0
index 293a52957..87a0f6144 100644
@@ -1,162 +1,34 @@
+// SPDX-License-Identifier: GPL-2.0-or-later

? /*
?? * Copyright (c) 2000 Silicon Graphics, Inc.? 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.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.? Any license provided herein, whether implied or
- * otherwise, applies only to this software file.? Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * 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.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA? 94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */

testcases/kernel/syscalls/times/times01.c +1 -57
-/* $Id: times01.c,v 1.6 2009/10/26 14:55:48 subrata_modak Exp $ */
-/**********************************************************
- *
- *??? OS Test - Silicon Graphics, Inc.
- *
- *??? TEST IDENTIFIER??? : times01
- *
- *??? EXECUTED BY??? : anyone
- *
- *??? TEST TITLE??? : Basic test for times(2)
- *
- *??? PARENT DOCUMENT??? : usctpl01
- *
- *??? TEST CASE TOTAL??? : 1
- *
- *??? WALL CLOCK TIME??? : 1
- *
- *??? CPU TYPES??????? : ALL
- *
- *??? AUTHOR??????? : William Roske
- *
- *??? CO-PILOT??????? : Dave Fenner
- *
- *??? DATE STARTED??? : 03/30/92
- *
- *??? INITIAL RELEASE??? : UNICOS 7.0
- *
- *??? TEST CASES
- *
- *???? 1.) times(2) returns...(See Description)
- *
- *??? INPUT SPECIFICATIONS
- *???? The standard options for system call tests are accepted.
- *??? (See the parse_opts(3) man page).
- *
- *??? OUTPUT SPECIFICATIONS
- *$
- *??? DURATION
- *???? Terminates - with frequency and infinite modes.
- *
- *??? SIGNALS
- *???? Uses SIGUSR1 to pause before test if option set.
- *???? (See the parse_opts(3) man page).
- *
- *??? RESOURCES
- *???? None
- *
- *??? ENVIRONMENTAL NEEDS
- *????? No run-time environmental needs.
- *
- *??? SPECIAL PROCEDURAL REQUIREMENTS
- *???? None
- *
- *??? INTERCASE DEPENDENCIES
- *???? None
- *
- *??? DETAILED DESCRIPTION
+ * DESCRIPTION

?? *??? This is a Phase I test for the times(2) system call.? It is intended
- *??? to provide a limited exposure of the system call, for now.? It
- *??? should/will be extended when full functional tests are written for
- *??? times(2).
- *
- *???? Setup:
- *?????? Setup signal handling.
- *????? Pause for SIGUSR1 if option specified.
- *
- *???? Test:
- *???? Loop if the proper options are given.

Quoted 8 lines

- *?????? 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.
+ *??? to provide a limited exposure of the system call. ?? *
- *???? Cleanup:
- *?????? Print errno log and/or timing stats if options given

Hi Ruan,

Please use the following format of description comment so that it can be picked up by docparser:
--------------------------------------
/*\
? * [DESCRIPTION]
...
\*/
--------------------------------------

Quoted 9 lines

- *
- *
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
+ * ALGORITHM:
+ *??? 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.
+ */

This test is very easy so remove the algorithm comment directly.

Quoted 41 lines

-#include<sys/types.h>
? #include<sys/times.h>
? #include<errno.h>

testcases/kernel/syscalls/times/times01.c +2 -12
-#include<string.h>
-#include<signal.h>
-#include "test.h"
-
-void setup();
-void cleanup();
-
-char *TCID = "times01";
-int TST_TOTAL = 1;
-
-struct tms mytimes;
+#include "tst_test.h"
 
-int main(int ac, char **av)
+static void verify_times(void)

? {
-??? int lc;
+??? struct tms mytimes;

-??? tst_parse_opts(ac, av, NULL, NULL);
+??? TEST(times(&mytimes));

-??? setup();

testcases/kernel/syscalls/times/times01.c +0 -14
-
-??? for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-??????? tst_count = 0;
-
-??????? TEST(times(&mytimes));
-
-??????? if (TEST_RETURN == -1)
-??????????? tst_resm(TFAIL | TTERRNO, "times failed");
-??????? else
-??????????? tst_resm(TPASS, "times(&mytimes) returned %ld",
-???????????????? TEST_RETURN);
-
-??? }
Quoted 8 lines
Quoted 7 lines

-
-??? cleanup();
-??? tst_exit();
+??? if (TST_RET == -1)
+??????? tst_res(TFAIL | TTERRNO, "times failed");
+??? else
+??????? tst_res(TPASS, "times(&mytimes) returned %ld", TST_RET);

It is simpler to use TST_EXP_PASS() here (replace TEST()).

Got it. Thanks a lot.

--
Thanks,
Ruan Shiyang.

Quoted 19 lines

Best Regards,
Xiao Yang

Quoted 15 lines

? }

testcases/kernel/syscalls/times/times01.c +3 -10
-void setup(void)
-{
-??? tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-??? TEST_PAUSE;
-}
-
-void cleanup(void)
-{
-}
+static struct tst_test test = {
+??? .test_all = verify_times,
+};
#3 lore raw

PATCH 1/1 syscalls/times01: Convert to new API

Quoted 210 lines · Ruan Shiyang
Quoted 198 lines · Xiao Yang
Quoted 124 lines · Shiyang Ruan
---
  testcases/kernel/syscalls/times/times01.c | 168 
+++-------------------
  1 file changed, 20 insertions(+), 148 deletions(-)
testcases/kernel/syscalls/times/times01.c +1 -1
index 293a52957..87a0f6144 100644
@@ -1,162 +1,34 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
  /*
   * Copyright (c) 2000 Silicon Graphics, Inc.  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.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like. Any license provided herein, whether implied or
- * otherwise, applies only to this software file. Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * 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.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA 94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */

testcases/kernel/syscalls/times/times01.c +1 -57
-/* $Id: times01.c,v 1.6 2009/10/26 14:55:48 subrata_modak Exp $ */
-/**********************************************************
- *
- *    OS Test - Silicon Graphics, Inc.
- *
- *    TEST IDENTIFIER    : times01
- *
- *    EXECUTED BY    : anyone
- *
- *    TEST TITLE    : Basic test for times(2)
- *
- *    PARENT DOCUMENT    : usctpl01
- *
- *    TEST CASE TOTAL    : 1
- *
- *    WALL CLOCK TIME    : 1
- *
- *    CPU TYPES        : ALL
- *
- *    AUTHOR        : William Roske
- *
- *    CO-PILOT        : Dave Fenner
- *
- *    DATE STARTED    : 03/30/92
- *
- *    INITIAL RELEASE    : UNICOS 7.0
- *
- *    TEST CASES
- *
- *     1.) times(2) returns...(See Description)
- *
- *    INPUT SPECIFICATIONS
- *     The standard options for system call tests are accepted.
- *    (See the parse_opts(3) man page).
- *
- *    OUTPUT SPECIFICATIONS
- *$
- *    DURATION
- *     Terminates - with frequency and infinite modes.
- *
- *    SIGNALS
- *     Uses SIGUSR1 to pause before test if option set.
- *     (See the parse_opts(3) man page).
- *
- *    RESOURCES
- *     None
- *
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- *
- *    SPECIAL PROCEDURAL REQUIREMENTS
- *     None
- *
- *    INTERCASE DEPENDENCIES
- *     None
- *
- *    DETAILED DESCRIPTION
+ * DESCRIPTION
   *    This is a Phase I test for the times(2) system call.  It is 

intended
- * to provide a limited exposure of the system call, for now. It
- * should/will be extended when full functional tests are
written for
- * times(2).
- *
- * Setup:
- * Setup signal handling.
- * Pause for SIGUSR1 if option specified.
- *
- * Test:
- * Loop if the proper options are given.

Quoted 8 lines

- * 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.
+ * to provide a limited exposure of the system call.
*
- * Cleanup:
- * Print errno log and/or timing stats if options given

Hi Ruan,

Please use the following format of description comment so that it can be picked up by docparser:
--------------------------------------
/*\
* [DESCRIPTION]
...
\*/
--------------------------------------

Quoted 9 lines

- *
- *
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
+ * ALGORITHM:
+ * 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.
+ */

This test is very easy so remove the algorithm comment directly.

Quoted 41 lines
testcases/kernel/syscalls/times/times01.c +4 -30
-#include<sys/types.h>
  #include<sys/times.h>
  #include<errno.h>
-#include<string.h>
-#include<signal.h>
-#include "test.h"
-
-void setup();
-void cleanup();
-
-char *TCID = "times01";
-int TST_TOTAL = 1;
-
-struct tms mytimes;
+#include "tst_test.h"
 
-int main(int ac, char **av)
+static void verify_times(void)
  {
-    int lc;
+    struct tms mytimes;
 
-    tst_parse_opts(ac, av, NULL, NULL);
+    TEST(times(&mytimes));
 
-    setup();
-
-    for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-        tst_count = 0;
-
-        TEST(times(&mytimes));
-
-        if (TEST_RETURN == -1)
-            tst_resm(TFAIL | TTERRNO, "times failed");
-        else
-            tst_resm(TPASS, "times(&mytimes) returned %ld",
-                 TEST_RETURN);
-
-    }
Quoted 8 lines

testcases/kernel/syscalls/times/times01.c line 29

Quoted 7 lines
testcases/kernel/syscalls/times/times01.c +4 -3
-
-    cleanup();
-    tst_exit();
+    if (TST_RET == -1)
+        tst_res(TFAIL | TTERRNO, "times failed");
+    else
+        tst_res(TPASS, "times(&mytimes) returned %ld", TST_RET);

It is simpler to use TST_EXP_PASS() here (replace TEST()).

Quoted 1 line

Got it. Thanks a lot.

Hi Ruan,

Sorry, times() returns the number of clock ticks instead of zero on success. It is wrong to use TST_EXP_PASS() and just keep it.

Best Regards,
Xiao Yang

Quoted 26 lines
Signature · 3 lines
-- 
Thanks,
Ruan Shiyang.
Quoted 5 lines

Best Regards,
Xiao Yang

Quoted 2 lines
  }
Quoted 14 lines

testcases/kernel/syscalls/times/times01.c line 34

Quoted 13 lines
testcases/kernel/syscalls/times/times01.c +3 -10
-void setup(void)
-{
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    TEST_PAUSE;
-}
-
-void cleanup(void)
-{
-}
+static struct tst_test test = {
+    .test_all = verify_times,
+};

.