sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

Move blackbox tests closer to what they're testing.

Browse Source
This commit is contained in:
Jelmer Vernooij 2008-06-26 10:56:59 +02:00
parent 3f48f68800
commit c9b2e2aa86
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
testprogs/blackbox/test_cifsdd.sh → source/client/tests/test_cifsdd.sh
View File

@ -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

4
testprogs/blackbox/test_smbclient.sh → source/client/tests/test_smbclient.sh
View File

@ -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"

4
testprogs/blackbox/test_wbinfo.sh → source/nsswitch/tests/test_wbinfo.sh
View File

@ -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"

8
source/selftest/samba4_tests.sh
View File

@ -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