From 91a7c8b01b498f06c29020452db96d5b5f2456c0 Mon Sep 17 00:00:00 2001 From: Kai Blin Date: Tue, 16 Dec 2008 15:45:12 +0100 Subject: nsswitch: Fix paths for Samba4 blackbox wbinfo test --- nsswitch/tests/test_wbinfo.sh | 4 ++-- source4/selftest/tests.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nsswitch/tests/test_wbinfo.sh b/nsswitch/tests/test_wbinfo.sh index 4937e7e1a9..8fa0db812d 100755 --- a/nsswitch/tests/test_wbinfo.sh +++ b/nsswitch/tests/test_wbinfo.sh @@ -14,10 +14,10 @@ TARGET=$4 shift 4 failed=0 -samba4bindir=`dirname $0`/../../bin +samba4bindir=`dirname $0`/../../source4/bin wbinfo=$samba4bindir/wbinfo -. `dirname $0`/../../../testprogs/blackbox/subunit.sh +. `dirname $0`/../../testprogs/blackbox/subunit.sh testfail() { name="$1" diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh index 49e8c2ef5d..569759835a 100755 --- a/source4/selftest/tests.sh +++ b/source4/selftest/tests.sh @@ -297,8 +297,8 @@ plantest "blackbox.nmblookup" member $samba4srcdir/utils/tests/test_nmblookup.sh plantest "blackbox.locktest" dc $samba4srcdir/torture/tests/test_locktest.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX" plantest "blackbox.masktest" dc $samba4srcdir/torture/tests/test_masktest.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX" plantest "blackbox.gentest" dc $samba4srcdir/torture/tests/test_gentest.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX" -plantest "blackbox.wbinfo" dc $samba4srcdir/nsswitch/tests/test_wbinfo.sh "\$DOMAIN" "\$USERNAME" "\$PASSWORD" "dc" -plantest "blackbox.wbinfo" member $samba4srcdir/nsswitch/tests/test_wbinfo.sh "\$DOMAIN" "\$DC_USERNAME" "\$DC_PASSWORD" "member" +plantest "blackbox.wbinfo" dc $samba4srcdir/../nsswitch/tests/test_wbinfo.sh "\$DOMAIN" "\$USERNAME" "\$PASSWORD" "dc" +plantest "blackbox.wbinfo" member $samba4srcdir/../nsswitch/tests/test_wbinfo.sh "\$DOMAIN" "\$DC_USERNAME" "\$DC_PASSWORD" "member" # Tests using the "Simple" NTVFS backend -- cgit