summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Blin <kai@samba.org>2008-12-16 15:45:12 +0100
committerKai Blin <kai@samba.org>2008-12-16 15:46:03 +0100
commit91a7c8b01b498f06c29020452db96d5b5f2456c0 (patch)
treef48e3234b1e33b3a931cb8783039a4e1400fad6d
parenta7109b183b555ee795c3e32c63e2647025705fc1 (diff)
downloadsamba-91a7c8b01b498f06c29020452db96d5b5f2456c0.tar.gz
samba-91a7c8b01b498f06c29020452db96d5b5f2456c0.tar.bz2
samba-91a7c8b01b498f06c29020452db96d5b5f2456c0.zip
nsswitch: Fix paths for Samba4 blackbox wbinfo test
-rwxr-xr-xnsswitch/tests/test_wbinfo.sh4
-rwxr-xr-xsource4/selftest/tests.sh4
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