From b7ae514b3b48b2a8a75729a6621ca36a37c530f8 Mon Sep 17 00:00:00 2001 From: Colin Vidal Date: Fri, 28 Mar 2025 12:55:49 +0100 Subject: [PATCH] fix out-of-tree mem_test Previously changed mem_test (!10320) introduces a test which checks for the value of `__FILE__`, which is different if the build is done out-of-tree or not, even though this is not relevant for the test (only the base filename is). This result in a broken test for out-of-tree builds. Fix this by changing the way the "grep" is done in the test, ignoring the optional path prefix in the filename. --- tests/isc/mem_test.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/isc/mem_test.c b/tests/isc/mem_test.c index 31a6364834..7111b52141 100644 --- a/tests/isc/mem_test.c +++ b/tests/isc/mem_test.c @@ -418,9 +418,12 @@ ISC_RUN_TEST_IMPL(isc_mem_recordflag) { /* * Find the allocation of ptr and make sure it contains "[...] 2048 file - * mem_test.c line [...]" + * [...]" (the "grep" is done in 2 phases because the prefix of the path + * of mem_test.c will change if test is built out-of-tree) */ - p = strstr(buf, "2048 file mem_test.c line"); + p = strstr(buf, "2048 file "); + assert_non_null(p); + p = strstr(p, "mem_test.c line"); assert_non_null(p); }