diff options
| author | Andreas Schneider <asn@samba.org> | 2022-12-22 14:43:45 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2022-12-23 14:35:31 +0000 |
| commit | eb6f74bd74f4157caf5dec751f43d23a52aedf77 (patch) | |
| tree | bc2f66c681202bb560fc1cec79f7548af51d36cc /testprogs | |
| parent | 40eeec0fff8d06b3c5a6e3c92f3fa1a61802092c (diff) | |
| download | samba-eb6f74bd74f4157caf5dec751f43d23a52aedf77.tar.gz | |
testprogs: Use system_or_builddir_binary() for upgradeprovision-oldrelease
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'testprogs')
| -rwxr-xr-x | testprogs/blackbox/upgradeprovision-oldrelease.sh | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/testprogs/blackbox/upgradeprovision-oldrelease.sh b/testprogs/blackbox/upgradeprovision-oldrelease.sh index 34d932f7e7b..820b8a4c389 100755 --- a/testprogs/blackbox/upgradeprovision-oldrelease.sh +++ b/testprogs/blackbox/upgradeprovision-oldrelease.sh @@ -18,15 +18,8 @@ failed=0 release_dir="$SRCDIR_ABS/source4/selftest/provisions/${RELEASE}" -LDBDEL_BIN=ldbdel -if [ -x "$BINDIR/ldbdel" ]; then - LDBDEL_BIN=$BINDIR/ldbdel -fi - -samba_tdbrestore="tdbrestore" -if [ -x "$BINDIR/tdbrestore" ]; then - samba_tdbrestore="$BINDIR/tdbrestore" -fi +ldbdel=$(system_or_builddir_binary ldbdel "${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 @@ -125,7 +118,7 @@ remove_dns_user() { if [ x$RELEASE != x"release-4-0-0" ]; then # This is done, because otherwise the upgrdeprovision will not run without --full - ${LDBDEL_BIN} -H tdb://$PREFIX_ABS/${RELEASE}_upgrade/private/sam.ldb cn=dns,cn=users,dc=${RELEASE},dc=samba,dc=corp + ${ldbdel} -H tdb://$PREFIX_ABS/${RELEASE}_upgrade/private/sam.ldb cn=dns,cn=users,dc=${RELEASE},dc=samba,dc=corp fi } |