[PATCH] tester: Remove timeout if pre-setup failed

[PATCH] tester: Remove timeout if pre-setup failed

[Inga Stotland]

[-- Attachment #1: Type: text/plain, Size: 792 bytes --]

If test pre setup stage fails, remove test run timeout.
Also, fix a stray call to free(): should be l_free().
---
 ell/tester.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ell/tester.c b/ell/tester.c
index 54fbb4b..7625b93 100644
--- a/ell/tester.c
+++ b/ell/tester.c
@@ -279,6 +279,9 @@ LIB_EXPORT void l_tester_pre_setup_failed(struct l_tester *tester)
 
 	print_progress(test->name, COLOR_RED, "pre setup failed");
 
+	l_timeout_remove(test->run_timer);
+	test->run_timer = NULL;
+
 	l_idle_oneshot(done_callback, tester, NULL);
 }
 
@@ -501,7 +504,7 @@ static void wait_callback(struct l_timeout *timer, void *user_data)
 
 	wait->func(wait->user_data);
 
-	free(wait);
+	l_free(wait);
 
 	l_timeout_remove(timer);
 }
-- 
2.26.3

Re: [PATCH] tester: Remove timeout if pre-setup failed

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 301 bytes --]

Hi Inga,

On 4/23/21 1:26 PM, Inga Stotland wrote:
> If test pre setup stage fails, remove test run timeout.
> Also, fix a stray call to free(): should be l_free().
> ---
>   ell/tester.c | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
> 

Applied, thanks.

Regards,
-Denis