summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-06-26 10:56:59 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-06-26 10:56:59 +0200
commit26e9194e3a3ff9b065fec43ad5f3b63187eb533b (patch)
treeb51e0d4bfca35a0482f8cd06a21e857128d1e815
parent4f4949a8f4d729e189e873f8f5b0161e875d3501 (diff)
downloadsamba-26e9194e3a3ff9b065fec43ad5f3b63187eb533b.tar.gz
samba-26e9194e3a3ff9b065fec43ad5f3b63187eb533b.tar.bz2
samba-26e9194e3a3ff9b065fec43ad5f3b63187eb533b.zip
Move blackbox tests closer to what they're testing.
(This used to be commit c9b2e2aa861ccc01e5d92cfe468be1f6324ed294)
-rwxr-xr-xsource4/client/tests/test_cifsdd.sh (renamed from testprogs/blackbox/test_cifsdd.sh)4
-rwxr-xr-xsource4/client/tests/test_smbclient.sh (renamed from testprogs/blackbox/test_smbclient.sh)4
-rwxr-xr-xsource4/nsswitch/tests/test_wbinfo.sh (renamed from testprogs/blackbox/test_wbinfo.sh)4
-rwxr-xr-xsource4/selftest/samba4_tests.sh8
4 files changed, 10 insertions, 10 deletions
diff --git a/testprogs/blackbox/test_cifsdd.sh b/source4/client/tests/test_cifsdd.sh
index 43564a0c77..08bfb25e80 100755
--- a/testprogs/blackbox/test_cifsdd.sh
+++ b/source4/client/tests/test_cifsdd.sh
@@ -14,9 +14,9 @@ USERNAME=$2
PASSWORD=$3
DOMAIN=$4
-. `dirname $0`/subunit.sh
+. `dirname $0`/../../../testprogs/blackbox/subunit.sh
-samba4bindir=`dirname $0`/../../source/bin
+samba4bindir=`dirname $0`/../../bin
DD=$samba4bindir/cifsdd
SHARE=tmp
diff --git a/testprogs/blackbox/test_smbclient.sh b/source4/client/tests/test_smbclient.sh
index d2c5c675e2..27a3488c88 100755
--- a/testprogs/blackbox/test_smbclient.sh
+++ b/source4/client/tests/test_smbclient.sh
@@ -18,10 +18,10 @@ PREFIX=$5
shift 5
failed=0
-samba4bindir=`dirname $0`/../../source/bin
+samba4bindir=`dirname $0`/../../bin
smbclient=$samba4bindir/smbclient
-. `dirname $0`/subunit.sh
+. `dirname $0`/../../../testprogs/blackbox/subunit.sh
runcmd() {
name="$1"
diff --git a/testprogs/blackbox/test_wbinfo.sh b/source4/nsswitch/tests/test_wbinfo.sh
index ec8b9ebd44..dfd633b656 100755
--- a/testprogs/blackbox/test_wbinfo.sh
+++ b/source4/nsswitch/tests/test_wbinfo.sh
@@ -14,10 +14,10 @@ TARGET=$4
shift 4
failed=0
-samba4bindir=`dirname $0`/../../source/bin
+samba4bindir=`dirname $0`/../../bin
wbinfo=$samba4bindir/wbinfo
-. `dirname $0`/subunit.sh
+. `dirname $0`/../../../testprogs/blackbox/subunit.sh
testfail() {
name="$1"
diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh
index 79ebc7b0f7..e67e035c31 100755
--- a/source4/selftest/samba4_tests.sh
+++ b/source4/selftest/samba4_tests.sh
@@ -268,16 +268,16 @@ fi
bbdir=$incdir/../../testprogs/blackbox
plantest "blackbox.ndrdump" dc $bbdir/test_ndrdump.sh
-plantest "blackbox.smbclient" dc $bbdir/test_smbclient.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX"
+plantest "blackbox.smbclient" dc $samba4srcdir/client/tests/test_smbclient.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX"
plantest "blackbox.kinit" dc $bbdir/test_kinit.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$REALM" "\$DOMAIN" "$PREFIX" $CONFIGURATION
-plantest "blackbox.cifsdd" dc $bbdir/test_cifsdd.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN"
+plantest "blackbox.cifsdd" dc $samba4srcdir/client/tests/test_cifsdd.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN"
plantest "blackbox.nmblookup" dc $samba4srcdir/utils/tests/test_nmblookup.sh "\$NETBIOSNAME" "\$NETBIOSALIAS" "\$SERVER" "\$SERVER_IP"
plantest "blackbox.nmblookup" member $samba4srcdir/utils/tests/test_nmblookup.sh "\$NETBIOSNAME" "\$NETBIOSALIAS" "\$SERVER" "\$SERVER_IP"
plantest "blackbox.locktest" dc $bbdir/test_locktest.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX"
plantest "blackbox.masktest" dc $bbdir/test_masktest.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX"
plantest "blackbox.gentest" dc $bbdir/test_gentest.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX"
-plantest "blackbox.wbinfo" dc $bbdir/test_wbinfo.sh "\$DOMAIN" "\$USERNAME" "\$PASSWORD" "dc"
-plantest "blackbox.wbinfo" member $bbdir/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"
plantest "blackbox.wintest" none $bbdir/test_wintest.sh "$TORTURE_OPTIONS"
# Tests using the "Simple" NTVFS backend