From: Colin Vidal <colin@isc.org>
Date: Fri, 28 Mar 2025 11:55:49 +0000 (+0100)
Subject: fix out-of-tree mem_test
X-Git-Tag: v9.21.7~13^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b7ae514b3b48b2a8a75729a6621ca36a37c530f8;p=thirdparty%2Fbind9.git

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.
---

diff --git a/tests/isc/mem_test.c b/tests/isc/mem_test.c
index 31a63648341..7111b521413 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);
 }