From 2c5c7abb15c8a1d6f68e6e795efa878ad4c92ff5 Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Fri, 16 Jun 2023 13:30:09 -0700 Subject: [PATCH] libtest: display the times after a test timeout error This is to help with test failure debugging. Ref: #11328 Closes #11329 --- tests/libtest/test.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/libtest/test.h b/tests/libtest/test.h index cb2d47ac7a..7eb7fdaa2f 100644 --- a/tests/libtest/test.h +++ b/tests/libtest/test.h @@ -440,12 +440,14 @@ extern int unitfail; tv_test_start = tutil_tvnow(); \ } while(0) -#define exe_test_timedout(Y,Z) do { \ - if(tutil_tvdiff(tutil_tvnow(), tv_test_start) > TEST_HANG_TIMEOUT) { \ - fprintf(stderr, "%s:%d ABORTING TEST, since it seems " \ - "that it would have run forever.\n", (Y), (Z)); \ - res = TEST_ERR_RUNS_FOREVER; \ - } \ +#define exe_test_timedout(Y,Z) do { \ + long timediff = tutil_tvdiff(tutil_tvnow(), tv_test_start); \ + if(timediff > (TEST_HANG_TIMEOUT)) { \ + fprintf(stderr, "%s:%d ABORTING TEST, since it seems " \ + "that it would have run forever (%ld ms > %ld ms)\n", \ + (Y), (Z), timediff, (long) (TEST_HANG_TIMEOUT)); \ + res = TEST_ERR_RUNS_FOREVER; \ + } \ } while(0) #define res_test_timedout() \