* [LTP] [PATCH] setitimer03: Rewrite using new LTP API
@ 2022-10-11 11:04 Avinesh Kumar
2022-10-20 10:56 ` Richard Palethorpe
0 siblings, 1 reply; 2+ messages in thread
From: Avinesh Kumar @ 2022-10-11 11:04 UTC (permalink / raw)
To: ltp
Signed-off-by: Avinesh Kumar <akumar@suse.de>
---
.../kernel/syscalls/setitimer/setitimer03.c | 168 +++---------------
1 file changed, 25 insertions(+), 143 deletions(-)
diff --git a/testcases/kernel/syscalls/setitimer/setitimer03.c b/testcases/kernel/syscalls/setitimer/setitimer03.c
index 418ec71f0..659eac9a3 100644
--- a/testcases/kernel/syscalls/setitimer/setitimer03.c
+++ b/testcases/kernel/syscalls/setitimer/setitimer03.c
@@ -1,158 +1,40 @@
+// 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
+ * 03/2001 - Written by Wayne Boyer
+ * Copyright (c) 2022 SUSE LLC Avinesh Kumar <avinesh.kumar@suse.com>
*/
-/*
- * NAME
- * setitimer03.c
+/*\
+ * [Description]
*
- * DESCRIPTION
- * setitimer03 - check that a setitimer() call fails as expected
- * with incorrect values.
- *
- * ALGORITHM
- * loop if that option was specified
- * allocate needed space and set up needed values
- * issue the system call
- * check the errno value
- * issue a PASS message if we get EINVAL
- * otherwise, the tests fails
- * issue a FAIL message
- * break any remaining tests
- * call cleanup
- *
- * USAGE: <for command-line>
- * setitimer03 [-c n] [-e] [-i n] [-I x] [-p x] [-t]
- * where, -c n : Run n copies concurrently.
- * -e : Turn on errno logging.
- * -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
- * 03/2001 - Written by Wayne Boyer
- *
- * RESTRICTIONS
- * none
+ * Verify that setitimer(2) syscall fails with EINVAL when given
+ * an invalid timer.
*/
-#include "test.h"
-
-#include <errno.h>
-#include <sys/time.h>
+#include "tst_test.h"
-void cleanup(void);
-void setup(void);
+static struct itimerval *new_value, *old_value;
-char *TCID = "setitimer03";
-int TST_TOTAL = 1;
-
-int main(int ac, char **av)
+static void setup(void)
{
- int lc;
- struct itimerval *value, *ovalue;
-
- tst_parse_opts(ac, av, NULL, NULL);
-
- setup(); /* global setup */
-
- /* The following loop checks looping state if -i option given */
-
- for (lc = 0; TEST_LOOPING(lc); lc++) {
- /* reset tst_count in case we are looping */
- tst_count = 0;
-
- /* allocate some space for timer structures */
-
- if ((value = malloc((size_t)sizeof(struct itimerval))) ==
- NULL) {
- tst_brkm(TBROK, cleanup, "value malloc failed");
- }
-
- if ((ovalue = malloc((size_t)sizeof(struct itimerval))) ==
- NULL) {
- tst_brkm(TBROK, cleanup, "value malloc failed");
- }
-
- /* set up some reasonable values */
-
- value->it_value.tv_sec = 30;
- value->it_value.tv_usec = 0;
- value->it_interval.tv_sec = 0;
- value->it_interval.tv_usec = 0;
-
- /*
- * issue the system call with the TEST() macro
- * ITIMER_REAL = 0, ITIMER_VIRTUAL = 1 and ITIMER_PROF = 2
- */
-
- /* make the first value negative to get a failure */
- TEST(setitimer(-ITIMER_PROF, value, ovalue));
-
- if (TEST_RETURN == 0) {
- tst_resm(TFAIL, "call failed to produce expected error "
- "- errno = %d - %s", TEST_ERRNO,
- strerror(TEST_ERRNO));
- continue;
- }
-
- switch (TEST_ERRNO) {
- case EINVAL:
- tst_resm(TPASS, "expected failure - errno = %d - %s",
- TEST_ERRNO, strerror(TEST_ERRNO));
- break;
- default:
- tst_resm(TFAIL, "call failed to produce expected error "
- "- errno = %d - %s", TEST_ERRNO,
- strerror(TEST_ERRNO));
- }
-
- /*
- * clean up things in case we are looping
- */
- free(value);
- free(ovalue);
- value = NULL;
- ovalue = NULL;
- }
-
- cleanup();
- tst_exit();
-
+ new_value->it_value.tv_sec = 30;
+ new_value->it_value.tv_usec = 0;
+ new_value->it_interval.tv_sec = 0;
+ new_value->it_interval.tv_usec = 0;
}
-/*
- * setup() - performs all the ONE TIME setup for this test.
- */
-void setup(void)
+static void run(void)
{
-
- tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
- TEST_PAUSE;
+ TST_EXP_FAIL(setitimer(-ITIMER_PROF, new_value, old_value), EINVAL);
}
-/*
- * cleanup() - performs all the ONE TIME cleanup for this test at completion
- * or premature exit.
- */
-void cleanup(void)
-{
-
-}
+static struct tst_test test = {
+ .test_all = run,
+ .setup = setup,
+ .bufs = (struct tst_buffers[]) {
+ {&new_value, .size = sizeof(struct itimerval)},
+ {&old_value, .size = sizeof(struct itimerval)},
+ {}
+ }
+};
--
2.37.3
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [LTP] [PATCH] setitimer03: Rewrite using new LTP API
2022-10-11 11:04 [LTP] [PATCH] setitimer03: Rewrite using new LTP API Avinesh Kumar
@ 2022-10-20 10:56 ` Richard Palethorpe
0 siblings, 0 replies; 2+ messages in thread
From: Richard Palethorpe @ 2022-10-20 10:56 UTC (permalink / raw)
To: Avinesh Kumar; +Cc: ltp
Hello,
As you probably know alread, we have another patch in flight which
merges this into setitimer02 by Li Wang. So I will mark this one as
rejected.
Avinesh Kumar <akumar@suse.de> writes:
> Signed-off-by: Avinesh Kumar <akumar@suse.de>
> ---
> .../kernel/syscalls/setitimer/setitimer03.c | 168 +++---------------
> 1 file changed, 25 insertions(+), 143 deletions(-)
>
> diff --git a/testcases/kernel/syscalls/setitimer/setitimer03.c b/testcases/kernel/syscalls/setitimer/setitimer03.c
> index 418ec71f0..659eac9a3 100644
> --- a/testcases/kernel/syscalls/setitimer/setitimer03.c
> +++ b/testcases/kernel/syscalls/setitimer/setitimer03.c
> @@ -1,158 +1,40 @@
> +// 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
> + * 03/2001 - Written by Wayne Boyer
> + * Copyright (c) 2022 SUSE LLC Avinesh Kumar <avinesh.kumar@suse.com>
> */
>
> -/*
> - * NAME
> - * setitimer03.c
> +/*\
> + * [Description]
> *
> - * DESCRIPTION
> - * setitimer03 - check that a setitimer() call fails as expected
> - * with incorrect values.
> - *
> - * ALGORITHM
> - * loop if that option was specified
> - * allocate needed space and set up needed values
> - * issue the system call
> - * check the errno value
> - * issue a PASS message if we get EINVAL
> - * otherwise, the tests fails
> - * issue a FAIL message
> - * break any remaining tests
> - * call cleanup
> - *
> - * USAGE: <for command-line>
> - * setitimer03 [-c n] [-e] [-i n] [-I x] [-p x] [-t]
> - * where, -c n : Run n copies concurrently.
> - * -e : Turn on errno logging.
> - * -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
> - * 03/2001 - Written by Wayne Boyer
> - *
> - * RESTRICTIONS
> - * none
> + * Verify that setitimer(2) syscall fails with EINVAL when given
> + * an invalid timer.
> */
>
> -#include "test.h"
> -
> -#include <errno.h>
> -#include <sys/time.h>
> +#include "tst_test.h"
>
> -void cleanup(void);
> -void setup(void);
> +static struct itimerval *new_value, *old_value;
>
> -char *TCID = "setitimer03";
> -int TST_TOTAL = 1;
> -
> -int main(int ac, char **av)
> +static void setup(void)
> {
> - int lc;
> - struct itimerval *value, *ovalue;
> -
> - tst_parse_opts(ac, av, NULL, NULL);
> -
> - setup(); /* global setup */
> -
> - /* The following loop checks looping state if -i option given */
> -
> - for (lc = 0; TEST_LOOPING(lc); lc++) {
> - /* reset tst_count in case we are looping */
> - tst_count = 0;
> -
> - /* allocate some space for timer structures */
> -
> - if ((value = malloc((size_t)sizeof(struct itimerval))) ==
> - NULL) {
> - tst_brkm(TBROK, cleanup, "value malloc failed");
> - }
> -
> - if ((ovalue = malloc((size_t)sizeof(struct itimerval))) ==
> - NULL) {
> - tst_brkm(TBROK, cleanup, "value malloc failed");
> - }
> -
> - /* set up some reasonable values */
> -
> - value->it_value.tv_sec = 30;
> - value->it_value.tv_usec = 0;
> - value->it_interval.tv_sec = 0;
> - value->it_interval.tv_usec = 0;
> -
> - /*
> - * issue the system call with the TEST() macro
> - * ITIMER_REAL = 0, ITIMER_VIRTUAL = 1 and ITIMER_PROF = 2
> - */
> -
> - /* make the first value negative to get a failure */
> - TEST(setitimer(-ITIMER_PROF, value, ovalue));
> -
> - if (TEST_RETURN == 0) {
> - tst_resm(TFAIL, "call failed to produce expected error "
> - "- errno = %d - %s", TEST_ERRNO,
> - strerror(TEST_ERRNO));
> - continue;
> - }
> -
> - switch (TEST_ERRNO) {
> - case EINVAL:
> - tst_resm(TPASS, "expected failure - errno = %d - %s",
> - TEST_ERRNO, strerror(TEST_ERRNO));
> - break;
> - default:
> - tst_resm(TFAIL, "call failed to produce expected error "
> - "- errno = %d - %s", TEST_ERRNO,
> - strerror(TEST_ERRNO));
> - }
> -
> - /*
> - * clean up things in case we are looping
> - */
> - free(value);
> - free(ovalue);
> - value = NULL;
> - ovalue = NULL;
> - }
> -
> - cleanup();
> - tst_exit();
> -
> + new_value->it_value.tv_sec = 30;
> + new_value->it_value.tv_usec = 0;
> + new_value->it_interval.tv_sec = 0;
> + new_value->it_interval.tv_usec = 0;
> }
>
> -/*
> - * setup() - performs all the ONE TIME setup for this test.
> - */
> -void setup(void)
> +static void run(void)
> {
> -
> - tst_sig(NOFORK, DEF_HANDLER, cleanup);
> -
> - TEST_PAUSE;
> + TST_EXP_FAIL(setitimer(-ITIMER_PROF, new_value, old_value), EINVAL);
> }
>
> -/*
> - * cleanup() - performs all the ONE TIME cleanup for this test at completion
> - * or premature exit.
> - */
> -void cleanup(void)
> -{
> -
> -}
> +static struct tst_test test = {
> + .test_all = run,
> + .setup = setup,
> + .bufs = (struct tst_buffers[]) {
> + {&new_value, .size = sizeof(struct itimerval)},
> + {&old_value, .size = sizeof(struct itimerval)},
> + {}
> + }
> +};
> --
> 2.37.3
--
Thank you,
Richard.
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-10-20 10:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-11 11:04 [LTP] [PATCH] setitimer03: Rewrite using new LTP API Avinesh Kumar
2022-10-20 10:56 ` Richard Palethorpe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox