[SCM] Samba Shared Repository - branch master updated - 91a7c8b01b498f06c29020452db96d5b5f2456c0

Kai Blin kai at samba.org
Tue Dec 16 14:46:41 GMT 2008


The branch, master has been updated
       via  91a7c8b01b498f06c29020452db96d5b5f2456c0 (commit)
      from  a7109b183b555ee795c3e32c63e2647025705fc1 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 91a7c8b01b498f06c29020452db96d5b5f2456c0
Author: Kai Blin <kai at samba.org>
Date:   Tue Dec 16 15:45:12 2008 +0100

    nsswitch: Fix paths for Samba4 blackbox wbinfo test

-----------------------------------------------------------------------

Summary of changes:
 nsswitch/tests/test_wbinfo.sh |    4 ++--
 source4/selftest/tests.sh     |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/nsswitch/tests/test_wbinfo.sh b/nsswitch/tests/test_wbinfo.sh
index 4937e7e..8fa0db8 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 49e8c2e..5697598 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
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list