[LTP] [PATCH V7 02/19] syscalls/timer_gettime: Add support for time64 tests

Viresh Kumar
2020-06-26T06:22:15Z

This adds support for time64 tests to the existing timer_gettime()
syscall tests.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
.../syscalls/timer_gettime/timer_gettime01.c | 135 ++++++++----------
1 file changed, 63 insertions(+), 72 deletions(-)

diff --git a/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c b/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c
index 1c75f1cf0e45..f7083917317c 100644
--- a/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c
+++ b/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c
@@ -1,24 +1,10 @@
-/******************************************************************************
- * Copyright (c) Crackerjack Project., 2007 *
- * Porting from Crackerjack to LTP is done by: *
- * Manas Kumar Nayak <maknayak@in.ibm.com> *
- * Copyright (c) 2013 Cyril Hrubis <chrubis@suse.cz> *
- * *
- * 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 *
- * *
- ******************************************************************************/
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) Crackerjack Project., 2007
+ * Porting from Crackerjack to LTP is done by:
+ * Manas Kumar Nayak <maknayak@in.ibm.com>
+ * Copyright (c) 2013 Cyril Hrubis <chrubis@suse.cz>
+ */

#include <time.h>
#include <signal.h>
@@ -26,71 +12,76 @@
#include <stdio.h>
#include <errno.h>

-#include "test.h"
-#include "lapi/syscalls.h"
+#include "tst_timer.h"

-char *TCID = "timer_gettime01";
-int TST_TOTAL = 3;
+static struct test_variants {
+ int (*func)(timer_t timer, void *its);
+ enum tst_ts_type type;
+ char *desc;
+} variants[] = {
+#if (__NR_timer_gettime != __LTP__NR_INVALID_SYSCALL)
+ { .func = sys_timer_gettime, .type = TST_KERN_OLD_TIMESPEC, .desc = "syscall with old kernel spec"},
+#endif

-static void cleanup(void)
-{
- tst_rmdir();
-}
+#if (__NR_timer_gettime64 != __LTP__NR_INVALID_SYSCALL)
+ { .func = sys_timer_gettime64, .type = TST_KERN_TIMESPEC, .desc = "syscall time64 with kernel spec"},
+#endif
+};

-static void setup(void)
-{
- TEST_PAUSE;
- tst_tmpdir();
-}
+static timer_t timer;

-int main(int ac, char **av)
+static void setup(void)
{
- int lc;
-
struct sigevent ev;
- struct itimerspec spec;
- int timer;

- tst_parse_opts(ac, av, NULL, NULL);
-
- setup();
+ tst_res(TINFO, "Testing variant: %s", variants[tst_variant].desc);

ev.sigev_value = (union sigval) 0;
ev.sigev_signo = SIGALRM;
ev.sigev_notify = SIGEV_SIGNAL;
- TEST(ltp_syscall(__NR_timer_create, CLOCK_REALTIME, &ev, &timer));
-
- if (TEST_RETURN != 0)
- tst_brkm(TBROK | TERRNO, cleanup, "Failed to create timer");

- for (lc = 0; TEST_LOOPING(lc); ++lc) {
- tst_count = 0;
+ TEST(tst_syscall(__NR_timer_create, CLOCK_REALTIME, &ev, &timer));

- TEST(ltp_syscall(__NR_timer_gettime, timer, &spec));
- if (TEST_RETURN == 0) {
- tst_resm(TPASS, "timer_gettime(CLOCK_REALTIME) Passed");
- } else {
- tst_resm(TFAIL | TERRNO,
- "timer_gettime(CLOCK_REALTIME) Failed");
- }
-
- TEST(ltp_syscall(__NR_timer_gettime, -1, &spec));
- if (TEST_RETURN == -1 && TEST_ERRNO == EINVAL) {
- tst_resm(TPASS, "timer_gettime(-1) Failed: EINVAL");
- } else {
- tst_resm(TFAIL | TERRNO,
- "timer_gettime(-1) = %li", TEST_RETURN);
- }
+ if (TST_RET) {
+ tst_res(TFAIL | TTERRNO, "timer_create() failed");
+ return;
+ }
+}

- TEST(ltp_syscall(__NR_timer_gettime, timer, NULL));
- if (TEST_RETURN == -1 && TEST_ERRNO == EFAULT) {
- tst_resm(TPASS, "timer_gettime(NULL) Failed: EFAULT");
- } else {
- tst_resm(TFAIL | TERRNO,
- "timer_gettime(-1) = %li", TEST_RETURN);
- }
+static void verify(void)
+{
+ struct test_variants *tv = &variants[tst_variant];
+ struct tst_its spec = {.type = tv->type, };
+
+ TEST(tv->func(timer, tst_its_get(&spec)));
+ if (TST_RET == 0) {
+ if (tst_its_get_interval_sec(spec) ||
+ tst_its_get_interval_nsec(spec) ||
+ tst_its_get_value_sec(spec) ||
+ tst_its_get_value_nsec(spec))
+ tst_res(TFAIL, "timespec should have been zeroed");
+ else
+ tst_res(TPASS, "timer_gettime() Passed");
+ } else {
+ tst_res(TFAIL | TTERRNO, "timer_gettime() Failed");
}

- cleanup();
- tst_exit();
+ TEST(tv->func((timer_t)-1, tst_its_get(&spec)));
+ if (TST_RET == -1 && TST_ERR == EINVAL)
+ tst_res(TPASS, "timer_gettime(-1) Failed: EINVAL");
+ else
+ tst_res(TFAIL | TTERRNO, "timer_gettime(-1) = %li", TST_RET);
+
+ TEST(tv->func(timer, NULL));
+ if (TST_RET == -1 && TST_ERR == EFAULT)
+ tst_res(TPASS, "timer_gettime(NULL) Failed: EFAULT");
+ else
+ tst_res(TFAIL | TTERRNO, "timer_gettime(-1) = %li", TST_RET);
}
+
+static struct tst_test test = {
+ .test_all = verify,
+ .test_variants = ARRAY_SIZE(variants),
+ .setup = setup,
+ .needs_tmpdir = 1,
+};
--
2.25.0.rc1.19.g042ed3e048af