From: Andreas Schneider <asn@samba.org>
Date: Thu, 22 Dec 2022 14:25:49 +0000 (+0100)
Subject: s4:setup:tests: Use system ldbdump if we build with system ldb
X-Git-Tag: talloc-2.4.0~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08be04bb930f8cdb370ea3d3a31907ab475d8989;p=thirdparty%2Fsamba.git

s4:setup:tests: Use system ldbdump if we build with system ldb

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

Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Fri Dec 23 15:31:31 UTC 2022 on sn-devel-184
---

diff --git a/source4/setup/tests/blackbox_start_backup.sh b/source4/setup/tests/blackbox_start_backup.sh
index 044b9c49a78..b380c38617f 100755
--- a/source4/setup/tests/blackbox_start_backup.sh
+++ b/source4/setup/tests/blackbox_start_backup.sh
@@ -17,6 +17,9 @@ DBPATH=$PREFIX/start-backup
 mkdir -p $DBPATH
 
 . $(dirname $0)/../../../testprogs/blackbox/subunit.sh
+. "$(dirname ${0})/../../../testprogs/blackbox/common_test_fns.inc"
+
+ldbmodify=$(system_or_builddir_binary ldbmodify "${BINDIR}")
 
 do_provision()
 {
@@ -28,7 +31,7 @@ do_provision()
 add_backup_marker()
 {
 	# manually add the backup marker that the backup cmd usually adds
-	$BINDIR/ldbmodify \
+	${ldbmodify} \
 		-H tdb://$DBPATH/private/sam.ldb <<EOF
 dn: @SAMBA_DSDB
 changetype: modify