[LTP] [PATCH 5/6] cve-2015-3290: convert tst_remining_runtime()
Cyril Hrubis
chrubis@suse.cz
Mon Oct 25 18:01:33 CEST 2021
Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
---
testcases/cve/cve-2015-3290.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/testcases/cve/cve-2015-3290.c b/testcases/cve/cve-2015-3290.c
index 6c4fd57ac..9eb7127df 100644
--- a/testcases/cve/cve-2015-3290.c
+++ b/testcases/cve/cve-2015-3290.c
@@ -394,10 +394,6 @@ static void *child_thread(void *arg LTP_ATTRIBUTE_UNUSED)
return (void *)niter;
}
-#define TIMEOUT (180)
-#define TIME_TO_GIVEUP (TIMEOUT - 5)
-#define TIMER_TYPE CLOCK_MONOTONIC
-
static void do_child(void)
{
int i, ncpus;
@@ -414,7 +410,7 @@ static void do_child(void)
for (i = 0; i < ncpus; i++)
SAFE_PTHREAD_CREATE(&threads[i], NULL, child_thread, NULL);
- sleep(TIME_TO_GIVEUP);
+ sleep(tst_remaining_runtime());
running = 0;
for (i = 0; i < ncpus; i++) {
@@ -467,7 +463,7 @@ static struct tst_test test = {
.needs_root = 1,
.needs_checkpoints = 1,
.setup = setup,
- .timeout = TIMEOUT,
+ .max_runtime = 180,
.test_all = run,
.tags = (const struct tst_tag[]) {
{"linux-git", "9b6e6a8334d5"},
--
2.32.0
More information about the ltp
mailing list