From: Andreas Schneider <asn@samba.org>
Date: Thu, 22 Dec 2022 15:54:30 +0000 (+0100)
Subject: nsswitch:tests: Use system_or_builddir_binary() for test_rfc2307_mapping
X-Git-Tag: talloc-2.4.0~120
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5bed51fc6f001f521ab15bd01f4e30b034b4437b;p=thirdparty%2Fsamba.git

nsswitch:tests: Use system_or_builddir_binary() for test_rfc2307_mapping

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

diff --git a/nsswitch/tests/test_rfc2307_mapping.sh b/nsswitch/tests/test_rfc2307_mapping.sh
index d6d39a10b68..66ee865f8eb 100755
--- a/nsswitch/tests/test_rfc2307_mapping.sh
+++ b/nsswitch/tests/test_rfc2307_mapping.sh
@@ -19,14 +19,11 @@ failed=0
 samba4bindir="$BINDIR"
 wbinfo="$VALGRIND $samba4bindir/wbinfo"
 samba_tool="$VALGRIND $samba4bindir/samba-tool"
-if [ -f "$samba4bindir/ldbmodify" ]; then
-	ldbmodify="$samba4bindir/ldbmodify"
-else
-	# Using system ldbmodify
-	ldbmodify="ldbmodify"
-fi
 
 . $(dirname $0)/../../testprogs/blackbox/subunit.sh
+. "$(dirname "${0}")/../../testprogs/blackbox/common_test_fns.inc"
+
+ldbmodify=$(system_or_builddir_binary ldbmodify "${BINDIR}")
 
 testfail()
 {