* [LTP] [PATCH v2] syscalls/time{01, 02}: Convert to new API and merge them
@ 2021-01-27 10:22 Shiyang Ruan
2021-01-28 2:56 ` Xiao Yang
0 siblings, 1 reply; 4+ messages in thread
From: Shiyang Ruan @ 2021-01-27 10:22 UTC (permalink / raw)
To: ltp
Merge the two cases because each of them is very simple.
Signed-off-by: Shiyang Ruan <ruansy.fnst@cn.fujitsu.com>
---
testcases/kernel/syscalls/time/time01.c | 204 ++++++------------------
testcases/kernel/syscalls/time/time02.c | 147 -----------------
2 files changed, 47 insertions(+), 304 deletions(-)
delete mode 100644 testcases/kernel/syscalls/time/time02.c
diff --git a/testcases/kernel/syscalls/time/time01.c b/testcases/kernel/syscalls/time/time01.c
index 616a21fa8..4018069dd 100644
--- a/testcases/kernel/syscalls/time/time01.c
+++ b/testcases/kernel/syscalls/time/time01.c
@@ -1,173 +1,63 @@
+// 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: time01.c,v 1.6 2009/11/02 13:57:19 subrata_modak Exp $ */
-/**********************************************************
- *
- * OS Test - Silicon Graphics, Inc.
- *
- * TEST IDENTIFIER : time01
- *
- * EXECUTED BY : anyone
- *
- * TEST TITLE : Basic test for time(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.) time(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
- * This is a Phase I test for the time(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
- * time(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.
- *
- * Cleanup:
- * Print errno log and/or timing stats if options given
- *
- *
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <time.h>
-#include "test.h"
+/*\
+ * [DESCRIPTION]
+ * 1) Basic test for the time(2) system call. It is intended to provide a
+ * limited exposure of the system call.
+ * 2) Verify that time(2) returns the value of time in seconds since the Epoch
+ * and stores this value in the memory pointed to by the parameter.
+\*/
-void setup();
-void cleanup();
+#include <time.h>
+#include <errno.h>
-char *TCID = "time01";
-int TST_TOTAL = 1;
+#include "tst_test.h"
-int main(int ac, char **av)
+static void verify_time(void)
{
- int lc;
-
- tst_parse_opts(ac, av, NULL, NULL);
-
- setup();
-
- for (lc = 0; TEST_LOOPING(lc); lc++) {
+ TEST(time(0));
- tst_count = 0;
-
- /*
- * Call time(2)
- */
- TEST(time(0));
-
- /* check return code */
- if (TEST_RETURN == -1) {
- tst_resm(TFAIL, "time(0) Failed, errno=%d : %s",
- TEST_ERRNO, strerror(TEST_ERRNO));
- } else {
- tst_resm(TPASS, "time(0) returned %ld",
- TEST_RETURN);
- }
- }
-
- cleanup();
- tst_exit();
+ if (TST_RET == -1)
+ tst_res(TFAIL | TTERRNO, "time(0)");
+ else
+ tst_res(TPASS, "time(0) returned %ld", TST_RET);
}
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void setup(void)
+static void verify_time_store(void)
{
- void trapper();
-
- tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
- TEST_PAUSE;
+ time_t tloc;
+
+ TEST(time(&tloc));
+
+ if (TST_RET == -1)
+ tst_res(TFAIL | TTERRNO, "time(&tloc)");
+ else
+ if (tloc == TST_RET)
+ tst_res(TPASS, "time(&tloc) returned value %ld, "
+ "stored value %jd are same",
+ TST_RET, (intmax_t) tloc);
+ else
+ tst_res(TFAIL, "time(&tloc) returned value %ld, "
+ "stored value %jd are different",
+ TST_RET, (intmax_t) tloc);
}
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- * completion or premature exit.
- ***************************************************************/
-void cleanup(void)
+struct tcase {
+ void (*verify)(void);
+} tcases[] = {
+ { &verify_time },
+ { &verify_time_store },
+};
+
+static void run(unsigned int i)
{
+ tcases[i].verify();
}
+
+static struct tst_test test = {
+ .test = run,
+ .tcnt = ARRAY_SIZE(tcases),
+};
diff --git a/testcases/kernel/syscalls/time/time02.c b/testcases/kernel/syscalls/time/time02.c
deleted file mode 100644
index 137a3fda4..000000000
--- a/testcases/kernel/syscalls/time/time02.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- *
- * 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: time02
- *
- * Test Description:
- * Verify that time(2) returns the value of time in seconds since
- * the Epoch and stores this value in the memory pointed to by the parameter.
- *
- * Expected Result:
- * time() should return the time (seconds) since the Epoch and this value
- * should be equal to the value stored in the specified parameter.
- *
- * 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
- *
- * Usage: <for command-line>
- * time02 [-c n] [-e] [-f] [-i n] [-I x] [-p x] [-t]
- * where, -c n : Run n copies concurrently.
- * -e : Turn on errno logging.
- * -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 John George
- * -Ported
- *
- * Restrictions:
- * None.
- *
- */
-
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <time.h>
-#include <sys/types.h>
-#include <stdint.h>
-
-#include "test.h"
-
-void setup(); /* setup function for the test */
-void cleanup(); /* cleanup function for the test */
-
-char *TCID = "time02";
-int TST_TOTAL = 1;
-
-int main(int ac, char **av)
-{
- int lc;
- time_t tloc; /* time_t variables for time(2) */
-
- tst_parse_opts(ac, av, NULL, NULL);
-
- setup();
-
- for (lc = 0; TEST_LOOPING(lc); lc++) {
-
- tst_count = 0;
-
- /*
- * Call time() to get the time in seconds$
- * since Epoch.
- */
- TEST(time(&tloc));
-
- /* Check return code from time(2) */
- if (TEST_RETURN == -1) {
- tst_resm(TFAIL, "time(0) Failed, errno=%d : %s",
- TEST_ERRNO, strerror(TEST_ERRNO));
- } else {
- if (tloc == TEST_RETURN) {
- tst_resm(TPASS, "time() returned value "
- "%ld, stored value %jd are same",
- TEST_RETURN, (intmax_t) tloc);
- } else {
- tst_resm(TFAIL, "time() returned value "
- "%ld, stored value %jd are "
- "different", TEST_RETURN,
- (intmax_t) tloc);
- }
-
- }
- tst_count++; /* incr. TEST_LOOP counter */
- }
-
- cleanup();
- tst_exit();
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- */
-void setup(void)
-{
-
- tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
- TEST_PAUSE;
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- * completion or premature exit.
- */
-void cleanup(void)
-{
-
-}
--
2.30.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [LTP] [PATCH v2] syscalls/time{01, 02}: Convert to new API and merge them
2021-01-27 10:22 [LTP] [PATCH v2] syscalls/time{01, 02}: Convert to new API and merge them Shiyang Ruan
@ 2021-01-28 2:56 ` Xiao Yang
2021-01-28 5:30 ` Ruan Shiyang
0 siblings, 1 reply; 4+ messages in thread
From: Xiao Yang @ 2021-01-28 2:56 UTC (permalink / raw)
To: ltp
On 2021/1/27 18:22, Shiyang Ruan wrote:
> Merge the two cases because each of them is very simple.
>
> Signed-off-by: Shiyang Ruan<ruansy.fnst@cn.fujitsu.com>
> ---
> testcases/kernel/syscalls/time/time01.c | 204 ++++++------------------
> testcases/kernel/syscalls/time/time02.c | 147 -----------------
> 2 files changed, 47 insertions(+), 304 deletions(-)
> delete mode 100644 testcases/kernel/syscalls/time/time02.c
Hi Ruan,
You also need to remove all entries releated to time02, for example:
runtest/syscalls:time02 time02
testcases/kernel/syscalls/time/.gitignore:/time02
> diff --git a/testcases/kernel/syscalls/time/time01.c b/testcases/kernel/syscalls/time/time01.c
> index 616a21fa8..4018069dd 100644
> --- a/testcases/kernel/syscalls/time/time01.c
> +++ b/testcases/kernel/syscalls/time/time01.c
> @@ -1,173 +1,63 @@
> +// 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: time01.c,v 1.6 2009/11/02 13:57:19 subrata_modak Exp $ */
> -/**********************************************************
> - *
> - * OS Test - Silicon Graphics, Inc.
> - *
> - * TEST IDENTIFIER : time01
> - *
> - * EXECUTED BY : anyone
> - *
> - * TEST TITLE : Basic test for time(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.) time(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
> - * This is a Phase I test for the time(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
> - * time(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.
> - *
> - * Cleanup:
> - * Print errno log and/or timing stats if options given
> - *
> - *
> - *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
>
> -#include<errno.h>
> -#include<string.h>
> -#include<signal.h>
> -#include<time.h>
> -#include "test.h"
> +/*\
> + * [DESCRIPTION]
> + * 1) Basic test for the time(2) system call. It is intended to provide a
> + * limited exposure of the system call.
> + * 2) Verify that time(2) returns the value of time in seconds since the Epoch
> + * and stores this value in the memory pointed to by the parameter.
> +\*/
It is better to replace the number with '-' so that it follows the
markdown list.
>
> -void setup();
> -void cleanup();
> +#include<time.h>
> +#include<errno.h>
>
> -char *TCID = "time01";
> -int TST_TOTAL = 1;
> +#include "tst_test.h"
>
> -int main(int ac, char **av)
> +static void verify_time(void)
> {
> - int lc;
> -
> - tst_parse_opts(ac, av, NULL, NULL);
> -
> - setup();
> -
> - for (lc = 0; TEST_LOOPING(lc); lc++) {
> + TEST(time(0));
>
> - tst_count = 0;
> -
> - /*
> - * Call time(2)
> - */
> - TEST(time(0));
> -
> - /* check return code */
> - if (TEST_RETURN == -1) {
> - tst_resm(TFAIL, "time(0) Failed, errno=%d : %s",
> - TEST_ERRNO, strerror(TEST_ERRNO));
> - } else {
> - tst_resm(TPASS, "time(0) returned %ld",
> - TEST_RETURN);
> - }
> - }
> -
> - cleanup();
> - tst_exit();
> + if (TST_RET == -1)
> + tst_res(TFAIL | TTERRNO, "time(0)");
> + else
> + tst_res(TPASS, "time(0) returned %ld", TST_RET);
> }
>
> -/***************************************************************
> - * setup() - performs all ONE TIME setup for this test.
> - ***************************************************************/
> -void setup(void)
> +static void verify_time_store(void)
> {
> - void trapper();
> -
> - tst_sig(NOFORK, DEF_HANDLER, cleanup);
> -
> - TEST_PAUSE;
> + time_t tloc;
> +
> + TEST(time(&tloc));
> +
> + if (TST_RET == -1)
> + tst_res(TFAIL | TTERRNO, "time(&tloc)");
> + else
> + if (tloc == TST_RET)
> + tst_res(TPASS, "time(&tloc) returned value %ld, "
> + "stored value %jd are same",
> + TST_RET, (intmax_t) tloc);
> + else
> + tst_res(TFAIL, "time(&tloc) returned value %ld, "
> + "stored value %jd are different",
> + TST_RET, (intmax_t) tloc);
> }
>
> -/***************************************************************
> - * cleanup() - performs all ONE TIME cleanup for this test at
> - * completion or premature exit.
> - ***************************************************************/
> -void cleanup(void)
> +struct tcase {
> + void (*verify)(void);
> +} tcases[] = {
> + {&verify_time },
> + {&verify_time_store },
> +};
> +
> +static void run(unsigned int i)
> {
> + tcases[i].verify();
> }
I think we don't need to define two different functions.
How about defining different arguments and then pass them to time()? for
example:
struct time_t *args[2]= {NULL, &tloc};
static void verify_time_store(unsigned int i)
{
TEST(time(args[i]));
......
}
Best Regards,
Xiao Yang
> +
> +static struct tst_test test = {
> + .test = run,
> + .tcnt = ARRAY_SIZE(tcases),
> +};
> diff --git a/testcases/kernel/syscalls/time/time02.c b/testcases/kernel/syscalls/time/time02.c
> deleted file mode 100644
> index 137a3fda4..000000000
> --- a/testcases/kernel/syscalls/time/time02.c
> +++ /dev/null
> @@ -1,147 +0,0 @@
> -/*
> - *
> - * 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: time02
> - *
> - * Test Description:
> - * Verify that time(2) returns the value of time in seconds since
> - * the Epoch and stores this value in the memory pointed to by the parameter.
> - *
> - * Expected Result:
> - * time() should return the time (seconds) since the Epoch and this value
> - * should be equal to the value stored in the specified parameter.
> - *
> - * 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
> - *
> - * Usage:<for command-line>
> - * time02 [-c n] [-e] [-f] [-i n] [-I x] [-p x] [-t]
> - * where, -c n : Run n copies concurrently.
> - * -e : Turn on errno logging.
> - * -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 John George
> - * -Ported
> - *
> - * Restrictions:
> - * None.
> - *
> - */
> -
> -#include<stdio.h>
> -#include<errno.h>
> -#include<string.h>
> -#include<signal.h>
> -#include<time.h>
> -#include<sys/types.h>
> -#include<stdint.h>
> -
> -#include "test.h"
> -
> -void setup(); /* setup function for the test */
> -void cleanup(); /* cleanup function for the test */
> -
> -char *TCID = "time02";
> -int TST_TOTAL = 1;
> -
> -int main(int ac, char **av)
> -{
> - int lc;
> - time_t tloc; /* time_t variables for time(2) */
> -
> - tst_parse_opts(ac, av, NULL, NULL);
> -
> - setup();
> -
> - for (lc = 0; TEST_LOOPING(lc); lc++) {
> -
> - tst_count = 0;
> -
> - /*
> - * Call time() to get the time in seconds$
> - * since Epoch.
> - */
> - TEST(time(&tloc));
> -
> - /* Check return code from time(2) */
> - if (TEST_RETURN == -1) {
> - tst_resm(TFAIL, "time(0) Failed, errno=%d : %s",
> - TEST_ERRNO, strerror(TEST_ERRNO));
> - } else {
> - if (tloc == TEST_RETURN) {
> - tst_resm(TPASS, "time() returned value "
> - "%ld, stored value %jd are same",
> - TEST_RETURN, (intmax_t) tloc);
> - } else {
> - tst_resm(TFAIL, "time() returned value "
> - "%ld, stored value %jd are "
> - "different", TEST_RETURN,
> - (intmax_t) tloc);
> - }
> -
> - }
> - tst_count++; /* incr. TEST_LOOP counter */
> - }
> -
> - cleanup();
> - tst_exit();
> -}
> -
> -/*
> - * setup() - performs all ONE TIME setup for this test.
> - */
> -void setup(void)
> -{
> -
> - tst_sig(NOFORK, DEF_HANDLER, cleanup);
> -
> - TEST_PAUSE;
> -}
> -
> -/*
> - * cleanup() - performs all ONE TIME cleanup for this test at
> - * completion or premature exit.
> - */
> -void cleanup(void)
> -{
> -
> -}
^ permalink raw reply [flat|nested] 4+ messages in thread
* [LTP] [PATCH v2] syscalls/time{01, 02}: Convert to new API and merge them
2021-01-28 2:56 ` Xiao Yang
@ 2021-01-28 5:30 ` Ruan Shiyang
2021-01-28 6:41 ` Xiao Yang
0 siblings, 1 reply; 4+ messages in thread
From: Ruan Shiyang @ 2021-01-28 5:30 UTC (permalink / raw)
To: ltp
On 2021/1/28 ??10:56, Xiao Yang wrote:
> On 2021/1/27 18:22, Shiyang Ruan wrote:
>> Merge the two cases because each of them is very simple.
>>
>> Signed-off-by: Shiyang Ruan<ruansy.fnst@cn.fujitsu.com>
>> ---
>> ? testcases/kernel/syscalls/time/time01.c | 204 ++++++------------------
>> ? testcases/kernel/syscalls/time/time02.c | 147 -----------------
>> ? 2 files changed, 47 insertions(+), 304 deletions(-)
>> ? delete mode 100644 testcases/kernel/syscalls/time/time02.c
> Hi Ruan,
>
> You also need to remove all entries releated to time02, for example:
> runtest/syscalls:time02 time02
> testcases/kernel/syscalls/time/.gitignore:/time02 >
Yes, I forgot that.
...
>> +/*\
>> + * [DESCRIPTION]
>> + * 1) Basic test for the time(2) system call. It is intended to
>> provide a
>> + * limited exposure of the system call.
>> + * 2) Verify that time(2) returns the value of time in seconds since
>> the Epoch
>> + * and stores this value in the memory pointed to by the parameter.
>> +\*/
>
> It is better to replace the number with '-' so that it follows the
> markdown list.
>
OK.
>>
>> -void setup();
>> -void cleanup();
>> +#include<time.h>
>> +#include<errno.h>
>>
>> -char *TCID = "time01";
>> -int TST_TOTAL = 1;
>> +#include "tst_test.h"
>>
>> -int main(int ac, char **av)
>> +static void verify_time(void)
>> ? {
>> -??? int lc;
>> -
>> -??? tst_parse_opts(ac, av, NULL, NULL);
>> -
>> -??? setup();
>> -
>> -??? for (lc = 0; TEST_LOOPING(lc); lc++) {
>> +??? TEST(time(0));
>>
>> -??????? tst_count = 0;
>> -
>> -??????? /*
>> -???????? * Call time(2)
>> -???????? */
>> -??????? TEST(time(0));
>> -
>> -??????? /* check return code */
>> -??????? if (TEST_RETURN == -1) {
>> -??????????? tst_resm(TFAIL, "time(0) Failed, errno=%d : %s",
>> -???????????????? TEST_ERRNO, strerror(TEST_ERRNO));
>> -??????? } else {
>> -??????????? tst_resm(TPASS, "time(0) returned %ld",
>> -???????????????? TEST_RETURN);
>> -??????? }
>> -??? }
>> -
>> -??? cleanup();
>> -??? tst_exit();
>> +??? if (TST_RET == -1)
>> +??????? tst_res(TFAIL | TTERRNO, "time(0)");
>> +??? else
>> +??????? tst_res(TPASS, "time(0) returned %ld", TST_RET);
>> ? }
>>
>> -/***************************************************************
>> - * setup() - performs all ONE TIME setup for this test.
>> - ***************************************************************/
>> -void setup(void)
>> +static void verify_time_store(void)
>> ? {
>> -??? void trapper();
>> -
>> -??? tst_sig(NOFORK, DEF_HANDLER, cleanup);
>> -
>> -??? TEST_PAUSE;
>> +??? time_t tloc;
>> +
>> +??? TEST(time(&tloc));
>> +
>> +??? if (TST_RET == -1)
>> +??????? tst_res(TFAIL | TTERRNO, "time(&tloc)");
>> +??? else
>> +??????? if (tloc == TST_RET)
>> +??????????? tst_res(TPASS, "time(&tloc) returned value %ld, "
>> +?????????????????????? "stored value %jd are same",
>> +?????????????????????? TST_RET, (intmax_t) tloc);
>> +??????? else
>> +??????????? tst_res(TFAIL, "time(&tloc) returned value %ld, "
>> +?????????????????????? "stored value %jd are different",
>> +?????????????????????? TST_RET, (intmax_t) tloc);
>> ? }
>>
>> -/***************************************************************
>> - * cleanup() - performs all ONE TIME cleanup for this test at
>> - *??????? completion or premature exit.
>> - ***************************************************************/
>> -void cleanup(void)
>> +struct tcase {
>> +??? void (*verify)(void);
>> +} tcases[] = {
>> +??? {&verify_time },
>> +??? {&verify_time_store },
>> +};
>> +
>> +static void run(unsigned int i)
>> ? {
>> +??? tcases[i].verify();
>> ? }
> I think we don't need to define two different functions.
> How about defining different arguments and then pass them to time()? for
> example:
> struct time_t *args[2]= {NULL, &tloc};
>
> static void verify_time_store(unsigned int i)
> {
> ??? TEST(time(args[i]));
> ???? ......
> }
I think these two are different.
In `verify_time_store()`, we check the return value of `time(&tloc)` and
judge whether it is equal to the argument `tloc`. But in
`verify_time()`, the judgment of whether they are equal or not is not
necessary. So, I think the two functions are needed because of the
different logic.
--
Thanks,
Ruan Shiyang.
>
> Best Regards,
> Xiao Yang
>> +
>> +static struct tst_test test = {
>> +??? .test = run,
>> +??? .tcnt = ARRAY_SIZE(tcases),
>> +};
^ permalink raw reply [flat|nested] 4+ messages in thread
* [LTP] [PATCH v2] syscalls/time{01, 02}: Convert to new API and merge them
2021-01-28 5:30 ` Ruan Shiyang
@ 2021-01-28 6:41 ` Xiao Yang
0 siblings, 0 replies; 4+ messages in thread
From: Xiao Yang @ 2021-01-28 6:41 UTC (permalink / raw)
To: ltp
On 2021/1/28 13:30, Ruan Shiyang wrote:
>
>
> On 2021/1/28 ??10:56, Xiao Yang wrote:
>> On 2021/1/27 18:22, Shiyang Ruan wrote:
>>> Merge the two cases because each of them is very simple.
>>>
>>> Signed-off-by: Shiyang Ruan<ruansy.fnst@cn.fujitsu.com>
>>> ---
>>> testcases/kernel/syscalls/time/time01.c | 204
>>> ++++++------------------
>>> testcases/kernel/syscalls/time/time02.c | 147 -----------------
>>> 2 files changed, 47 insertions(+), 304 deletions(-)
>>> delete mode 100644 testcases/kernel/syscalls/time/time02.c
>> Hi Ruan,
>>
>> You also need to remove all entries releated to time02, for example:
>> runtest/syscalls:time02 time02
>> testcases/kernel/syscalls/time/.gitignore:/time02 >
>
> Yes, I forgot that.
>
> ...
>
>>> +/*\
>>> + * [DESCRIPTION]
>>> + * 1) Basic test for the time(2) system call. It is intended to
>>> provide a
>>> + * limited exposure of the system call.
>>> + * 2) Verify that time(2) returns the value of time in seconds
>>> since the Epoch
>>> + * and stores this value in the memory pointed to by the parameter.
>>> +\*/
>>
>> It is better to replace the number with '-' so that it follows the
>> markdown list.
>>
>
> OK.
>
>>>
>>> -void setup();
>>> -void cleanup();
>>> +#include<time.h>
>>> +#include<errno.h>
>>>
>>> -char *TCID = "time01";
>>> -int TST_TOTAL = 1;
>>> +#include "tst_test.h"
>>>
>>> -int main(int ac, char **av)
>>> +static void verify_time(void)
>>> {
>>> - int lc;
>>> -
>>> - tst_parse_opts(ac, av, NULL, NULL);
>>> -
>>> - setup();
>>> -
>>> - for (lc = 0; TEST_LOOPING(lc); lc++) {
>>> + TEST(time(0));
>>>
>>> - tst_count = 0;
>>> -
>>> - /*
>>> - * Call time(2)
>>> - */
>>> - TEST(time(0));
>>> -
>>> - /* check return code */
>>> - if (TEST_RETURN == -1) {
>>> - tst_resm(TFAIL, "time(0) Failed, errno=%d : %s",
>>> - TEST_ERRNO, strerror(TEST_ERRNO));
>>> - } else {
>>> - tst_resm(TPASS, "time(0) returned %ld",
>>> - TEST_RETURN);
>>> - }
>>> - }
>>> -
>>> - cleanup();
>>> - tst_exit();
>>> + if (TST_RET == -1)
>>> + tst_res(TFAIL | TTERRNO, "time(0)");
>>> + else
>>> + tst_res(TPASS, "time(0) returned %ld", TST_RET);
>>> }
>>>
>>> -/***************************************************************
>>> - * setup() - performs all ONE TIME setup for this test.
>>> - ***************************************************************/
>>> -void setup(void)
>>> +static void verify_time_store(void)
>>> {
>>> - void trapper();
>>> -
>>> - tst_sig(NOFORK, DEF_HANDLER, cleanup);
>>> -
>>> - TEST_PAUSE;
>>> + time_t tloc;
>>> +
>>> + TEST(time(&tloc));
>>> +
>>> + if (TST_RET == -1)
>>> + tst_res(TFAIL | TTERRNO, "time(&tloc)");
>>> + else
>>> + if (tloc == TST_RET)
>>> + tst_res(TPASS, "time(&tloc) returned value %ld, "
>>> + "stored value %jd are same",
>>> + TST_RET, (intmax_t) tloc);
>>> + else
>>> + tst_res(TFAIL, "time(&tloc) returned value %ld, "
>>> + "stored value %jd are different",
>>> + TST_RET, (intmax_t) tloc);
>>> }
>>>
>>> -/***************************************************************
>>> - * cleanup() - performs all ONE TIME cleanup for this test at
>>> - * completion or premature exit.
>>> - ***************************************************************/
>>> -void cleanup(void)
>>> +struct tcase {
>>> + void (*verify)(void);
>>> +} tcases[] = {
>>> + {&verify_time },
>>> + {&verify_time_store },
>>> +};
>>> +
>>> +static void run(unsigned int i)
>>> {
>>> + tcases[i].verify();
>>> }
>> I think we don't need to define two different functions.
>> How about defining different arguments and then pass them to time()?
>> for example:
>> struct time_t *args[2]= {NULL, &tloc};
>>
>> static void verify_time_store(unsigned int i)
>> {
>> TEST(time(args[i]));
>> ......
>> }
>
> I think these two are different.
>
> In `verify_time_store()`, we check the return value of `time(&tloc)`
> and judge whether it is equal to the argument `tloc`. But in
> `verify_time()`, the judgment of whether they are equal or not is not
> necessary. So, I think the two functions are needed because of the
> different logic.
Hi Ruan,
How about the following logic?
---------------------------------------------
static void verify_time(unsigned int i)
{
TEST(time(args[i]));
if (TST_RET == -1) {
tst_res(TFAIL | TTERRNO, "time(&tloc)");
return;
}
if (arg[i] && *args[i] != TST_RET) {
tst_res(TFAIL, "...");
return;
}
tst_res(TPASS, "...");
}
---------------------------------------------
Some same steps can be removed in original verify_time_store() and
verify_time(). Is it simpler?
By the way, I have no objection to use different functions.
Best Regards,
Xiao Yang
>
>
> --
> Thanks,
> Ruan Shiyang.
>
>>
>> Best Regards,
>> Xiao Yang
>>> +
>>> +static struct tst_test test = {
>>> + .test = run,
>>> + .tcnt = ARRAY_SIZE(tcases),
>>> +};
> .
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-01-28 6:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-27 10:22 [LTP] [PATCH v2] syscalls/time{01, 02}: Convert to new API and merge them Shiyang Ruan
2021-01-28 2:56 ` Xiao Yang
2021-01-28 5:30 ` Ruan Shiyang
2021-01-28 6:41 ` Xiao Yang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.