From: Andreas Schneider <asn@samba.org>
Date: Thu, 22 Dec 2022 13:02:04 +0000 (+0100)
Subject: testprogs: Use system_or_builddir_binary() for test_net_ads_dns
X-Git-Tag: talloc-2.4.0~129
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=535bc5dca7fdda0b00293f7670f320a6feb14247;p=thirdparty%2Fsamba.git

testprogs: Use system_or_builddir_binary() for test_net_ads_dns

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/testprogs/blackbox/test_net_ads_dns.sh b/testprogs/blackbox/test_net_ads_dns.sh
index feb731ca1fe..072a4c5c311 100755
--- a/testprogs/blackbox/test_net_ads_dns.sh
+++ b/testprogs/blackbox/test_net_ads_dns.sh
@@ -26,21 +26,14 @@ net_tool="$samba4bindir/net"
 smbpasswd="$samba4bindir/smbpasswd"
 texpect="$samba4bindir/texpect"
 
-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"
 
 . $(dirname $0)/subunit.sh
+. "$(dirname "${0}")/common_test_fns.inc"
+
+ldbmodify=$(system_or_builddir_binary ldbmodify "${BINDIR}")
+ldbsearch=$(system_or_builddir_binary ldbsearch "${BINDIR}")
 
 UID_WRAPPER_ROOT=1
 export UID_WRAPPER_ROOT