nsswitch:tests: Use system_or_builddir_binary() for test_rfc2307_mapping
authorAndreas Schneider <asn@samba.org>
Thu, 22 Dec 2022 15:54:30 +0000 (16:54 +0100)
committerAndreas Schneider <asn@cryptomilk.org>
Fri, 23 Dec 2022 14:35:31 +0000 (14:35 +0000)
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
nsswitch/tests/test_rfc2307_mapping.sh

index d6d39a10b689bfe3c797eb8a8a598a389b73a599..66ee865f8eb954c7a0ac4cf31e2242ee890fe07d 100755 (executable)
@@ -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()
 {