From: Andreas Schneider <asn@samba.org>
Date: Sun, 4 Dec 2022 18:44:52 +0000 (+0100)
Subject: testprogs: If built against system db use the system tools in test_net_ads_dns.sh
X-Git-Tag: talloc-2.4.0~416
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a97e54f35af800c5ccb15e54399d8935bf4f70d;p=thirdparty%2Fsamba.git

testprogs: If built against system db use the system tools in test_net_ads_dns.sh

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
---

diff --git a/testprogs/blackbox/test_net_ads_dns.sh b/testprogs/blackbox/test_net_ads_dns.sh
index 2409420f785..feb731ca1fe 100755
--- a/testprogs/blackbox/test_net_ads_dns.sh
+++ b/testprogs/blackbox/test_net_ads_dns.sh
@@ -25,8 +25,17 @@ samba_tool="$samba4bindir/samba-tool"
 net_tool="$samba4bindir/net"
 smbpasswd="$samba4bindir/smbpasswd"
 texpect="$samba4bindir/texpect"
-ldbsearch="$samba4bindir/ldbsearch"
-ldbmodify="$samba4bindir/ldbmodify"
+
+ldbsearch="${VALGRIND} ldbsearch"
+if [ -x "${BINDIR}/ldbsearch" ]; then
+	ldbsearch="${VALGRIND} ${BINDIR}/ldbsearch"
+fi
+
+ldbmodify="${VALGRIND} ldbmodify"
+if [ -x "${BINDIR}/ldbmodify" ]; then
+	ldbmodify="${VALGRIND} ${BINDIR}/ldbmodify"
+fi
+
 
 newuser="$samba_tool user create"
 groupaddmem="$samba_tool group addmembers"