summaryrefslogtreecommitdiff
path: root/testprogs
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2022-12-22 13:03:13 +0100
committerAndreas Schneider <asn@cryptomilk.org>2022-12-23 14:35:31 +0000
commitee11fafcc91bcd24d94e81f449cd5c637ca95823 (patch)
treef87c67dd8d723db304fb4efeb12e0494ec976ce8 /testprogs
parent0aa24330c55427f1feb0ce001a93808a23904e96 (diff)
downloadsamba-ee11fafcc91bcd24d94e81f449cd5c637ca95823.tar.gz
testprogs: Use system_or_builddir_binary() for dbcheck-oldrelease
Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'testprogs')
-rwxr-xr-xtestprogs/blackbox/dbcheck-oldrelease.sh25
1 files changed, 6 insertions, 19 deletions
diff --git a/testprogs/blackbox/dbcheck-oldrelease.sh b/testprogs/blackbox/dbcheck-oldrelease.sh
index 635ada9414c..afd2d1247ce 100755
--- a/testprogs/blackbox/dbcheck-oldrelease.sh
+++ b/testprogs/blackbox/dbcheck-oldrelease.sh
@@ -18,25 +18,12 @@ failed=0
release_dir=$(dirname $0)/../../source4/selftest/provisions/$RELEASE
-ldbmodify="ldbmodify"
-if [ -x "$BINDIR/ldbmodify" ]; then
- ldbmodify="$BINDIR/ldbmodify"
-fi
-
-ldbdel="ldbdel"
-if [ -x "$BINDIR/ldbdel" ]; then
- ldbdel="$BINDIR/ldbdel"
-fi
-
-ldbsearch="ldbsearch"
-if [ -x "$BINDIR/ldbsearch" ]; then
- ldbsearch="$BINDIR/ldbsearch"
-fi
-
-samba_tdbrestore="tdbrestore"
-if [ -x "$BINDIR/tdbrestore" ]; then
- samba_tdbrestore="$BINDIR/tdbrestore"
-fi
+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}")
+ldbrename=$(system_or_builddir_binary ldbrename "${BINDIR}")
+samba_tdbrestore=$(system_or_builddir_binary tdbrestore "${BINDIR}")
samba_undump="$SRCDIR_ABS/source4/selftest/provisions/undump.sh"
if [ ! -x $samba_undump ] || [ ! -d $release_dir ]; then