<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
<pre>Hi Cyril</pre>
<pre> I think this patch can be merged if it is ok.</pre>
<pre>Thanks
Yang Xu
</pre>
<blockquote type="cite"
cite="mid:1574044495-2813-1-git-send-email-xuyang2018.jy@cn.fujitsu.com">
<pre class="moz-quote-pre" wrap="">Move test setup function before PR_GET_TIMERSLACK in timer setup function so
that the library includes the newly set timerslack in the calculation.
Signed-off-by: Yang Xu <a class="moz-txt-link-rfc2396E" href="mailto:xuyang2018.jy@cn.fujitsu.com"><xuyang2018.jy@cn.fujitsu.com></a>
Reviewed-by: Cyril Hrubis <a class="moz-txt-link-rfc2396E" href="mailto:chrubis@suse.cz"><chrubis@suse.cz></a>
---
lib/tst_timer_test.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/lib/tst_timer_test.c b/lib/tst_timer_test.c
index f6459e5c0..13e9deff2 100644
--- a/lib/tst_timer_test.c
+++ b/lib/tst_timer_test.c
@@ -340,6 +340,9 @@ static void timer_setup(void)
struct timespec t;
int ret;
+ if (setup)
+ setup();
+
tst_clock_getres(CLOCK_MONOTONIC, &t);
tst_res(TINFO, "CLOCK_MONOTONIC resolution %lins", (long)t.tv_nsec);
@@ -360,16 +363,11 @@ static void timer_setup(void)
tst_res(TINFO, "PR_GET_TIMERSLACK not defined, using %uus",
timerslack);
#endif /* PR_GET_TIMERSLACK */
-
parse_timer_opts();
samples = SAFE_MALLOC(sizeof(long long) * MAX(MAX_SAMPLES, sample_cnt));
-
if (set_latency() < 0)
tst_res(TINFO, "Failed to set zero latency constraint: %m");
-
- if (setup)
- setup();
}
static void timer_cleanup(void)
</pre>
</blockquote>
</body>
</html>