summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-12-16 16:14:16 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-12-16 16:14:16 +0100
commitfda16c1c71ca84d5824173cc5fb3dafc84e7b67c (patch)
tree97e274d176c4ae7812b6fda2bdd698badd8f2dc6
parent46e3e84f1adb8dce5c823dfa4fae0ebd500d0e5f (diff)
parent91a7c8b01b498f06c29020452db96d5b5f2456c0 (diff)
downloadsamba-fda16c1c71ca84d5824173cc5fb3dafc84e7b67c.tar.gz
samba-fda16c1c71ca84d5824173cc5fb3dafc84e7b67c.tar.bz2
samba-fda16c1c71ca84d5824173cc5fb3dafc84e7b67c.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba
-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