diff options
| author | Andreas Schneider <asn@samba.org> | 2022-12-22 12:57:39 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2022-12-23 14:35:31 +0000 |
| commit | 0aa24330c55427f1feb0ce001a93808a23904e96 (patch) | |
| tree | 865bf1cdbdb72a720ff84f6da766ce46447a124b /testprogs | |
| parent | e5910d2895ed6f7665f79876de433b861bfdb237 (diff) | |
| download | samba-0aa24330c55427f1feb0ce001a93808a23904e96.tar.gz | |
testprogs: Use system_or_builddir_binary() for dbcheck and runtime tests
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'testprogs')
| -rw-r--r-- | testprogs/blackbox/common-links.sh | 35 | ||||
| -rwxr-xr-x | testprogs/blackbox/dbcheck-links.sh | 2 | ||||
| -rwxr-xr-x | testprogs/blackbox/runtime-links.sh | 2 |
3 files changed, 8 insertions, 31 deletions
diff --git a/testprogs/blackbox/common-links.sh b/testprogs/blackbox/common-links.sh index 92cf730ffc0..281b0d9c196 100644 --- a/testprogs/blackbox/common-links.sh +++ b/testprogs/blackbox/common-links.sh @@ -1,34 +1,11 @@ release_dir=$SRCDIR_ABS/source4/selftest/provisions/$RELEASE -ldbadd="ldbadd" -if [ -x "$BINDIR/ldbadd" ]; then - ldbadd="$BINDIR/ldbadd" -fi - -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 - -ldbrename="ldbrename" -if [ -x "$BINDIR/ldbrename" ]; then - ldbrename="$BINDIR/ldbrename" -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" diff --git a/testprogs/blackbox/dbcheck-links.sh b/testprogs/blackbox/dbcheck-links.sh index 29fb5b85abc..aaf93a8cc48 100755 --- a/testprogs/blackbox/dbcheck-links.sh +++ b/testprogs/blackbox/dbcheck-links.sh @@ -13,8 +13,8 @@ shift 2 . $(dirname $0)/subunit.sh -. $(dirname $0)/common-links.sh . $(dirname $0)/common_test_fns.inc +. $(dirname $0)/common-links.sh failed=0 diff --git a/testprogs/blackbox/runtime-links.sh b/testprogs/blackbox/runtime-links.sh index 3862dd973d9..0da06bd7273 100755 --- a/testprogs/blackbox/runtime-links.sh +++ b/testprogs/blackbox/runtime-links.sh @@ -15,9 +15,9 @@ failed=0 . $(dirname $0)/subunit.sh +. $(dirname $0)/common_test_fns.inc . $(dirname $0)/common-links.sh -. $(dirname $0)/common_test_fns.inc if [ ! -x $samba_undump ] || [ ! -d $release_dir ]; then subunit_start_test $RELEASE |