diff options
| author | Andreas Schneider <asn@samba.org> | 2020-10-21 17:35:34 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2020-10-27 08:22:02 +0000 |
| commit | 2aad79378ad8aec28026649157bad4c229ab22c0 (patch) | |
| tree | b750ed6fb1b8c59ac25b5871ff9a6e54346904e7 /testprogs/blackbox/common-links.sh | |
| parent | 62e97089a880a613cbb9bfd038e276390fe6dda6 (diff) | |
| download | samba-2aad79378ad8aec28026649157bad4c229ab22c0.tar.gz | |
testprogs: Fix and improve runtime-links test
This fixes running `make test` in a release tarball!
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14542
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
(cherry picked from commit a9765084f11eae991516f150d1cd1c2370854ec7)
Diffstat (limited to 'testprogs/blackbox/common-links.sh')
| -rw-r--r-- | testprogs/blackbox/common-links.sh | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/testprogs/blackbox/common-links.sh b/testprogs/blackbox/common-links.sh index ee7310b5108..363234ae11c 100644 --- a/testprogs/blackbox/common-links.sh +++ b/testprogs/blackbox/common-links.sh @@ -1,4 +1,4 @@ -release_dir=`dirname $0`/../../source4/selftest/provisions/$RELEASE +release_dir=$SRCDIR_ABS/source4/selftest/provisions/$RELEASE ldbadd="ldbadd" if [ -x "$BINDIR/ldbadd" ]; then @@ -25,13 +25,15 @@ if [ -x "$BINDIR/ldbrename" ]; then ldbrename="$BINDIR/ldbrename" fi +samba_tdbrestore="tdbrestore" +if [ -x "$BINDIR/tdbrestore" ]; then + samba_tdbrestore="$BINDIR/tdbrestore" +fi + +samba_undump="$SRCDIR_ABS/source4/selftest/provisions/undump.sh" + undump() { - if test -x $BINDIR/tdbrestore; - then - `dirname $0`/../../source4/selftest/provisions/undump.sh $release_dir $PREFIX_ABS/$RELEASE $BINDIR/tdbrestore - else - `dirname $0`/../../source4/selftest/provisions/undump.sh $release_dir $PREFIX_ABS/$RELEASE - fi + $samba_undump $release_dir $PREFIX_ABS/$RELEASE $samba_tdbrestore } add_dangling_link() { |