testprogs: Use system_or_builddir_binary() for test_net_ads

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

diff --git a/testprogs/blackbox/test_net_ads.sh b/testprogs/blackbox/test_net_ads.sh
index b46a0e36489b908d97fe456c020f17f3885d9b3f..0f096feb6f3ce8d2ac8810f0dcaf129f5b0cec25 100755 (executable)
--- a/testprogs/blackbox/test_net_ads.sh
+++ b/testprogs/blackbox/test_net_ads.sh
@@ -26,28 +26,14 @@ failed=0
 
 net_tool="$BINDIR/net --configfile=$BASEDIR/$WORKDIR/client.conf --option=security=ads"
 
-ldbsearch="ldbsearch"
-if [ -x "$BINDIR/ldbsearch" ]; then
-       ldbsearch="$BINDIR/ldbsearch"
-fi
-
-ldbadd="ldbadd"
-if [ -x "$BINDIR/ldbadd" ]; then
-       ldbadd="$BINDIR/ldbadd"
-fi
-
-ldbdel="ldbdel"
-if [ -x "$BINDIR/ldbdel" ]; then
-       ldbdel="$BINDIR/ldbdel"
-fi
-
-ldbmodify="ldbmodify"
-if [ -x "$BINDIR/ldbmodify" ]; then
-       ldbmodify="$BINDIR/ldbmodify"
-fi
-
 # Load test functions
 . $(dirname $0)/subunit.sh
+. "$(dirname "${0}")/common_test_fns.inc"
+
+ldbadd=$(system_or_builddir_binary ldbadd "${BINDIR}")
+ldbmodify=$(system_or_builddir_binary ldbmodify "${BINDIR}")
+ldbdel=$(system_or_builddir_binary ldbdel "${BINDIR}")
+ldbsearch=$(system_or_builddir_binary ldbsearch "${BINDIR}")
 
 testit "join" $VALGRIND $net_tool ads join -U$DC_USERNAME%$DC_PASSWORD || failed=$(expr $failed + 1)