Move blackbox tests closer to what they're testing.

diff --git a/testprogs/blackbox/test_cifsdd.sh b/source/client/tests/test_cifsdd.sh
similarity index 95%
rename from testprogs/blackbox/test_cifsdd.sh
rename to source/client/tests/test_cifsdd.sh
index 43564a0c77f3ba9601ecc1c4087e44181dfc535a..08bfb25e80809d41ce939a6bd049d96ef5cce68e 100755 (executable)
--- a/testprogs/blackbox/test_cifsdd.sh
+++ b/source/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/source/client/tests/test_smbclient.sh
similarity index 98%
rename from testprogs/blackbox/test_smbclient.sh
rename to source/client/tests/test_smbclient.sh
index d2c5c675e2ef7dafee77dac9241471b386453f74..27a3488c88a22431d00d7036db1e3395fc163265 100755 (executable)
--- a/testprogs/blackbox/test_smbclient.sh
+++ b/source/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/source/nsswitch/tests/test_wbinfo.sh
similarity index 98%
rename from testprogs/blackbox/test_wbinfo.sh
rename to source/nsswitch/tests/test_wbinfo.sh
index ec8b9ebd443b20117cc096bea0f6247b09268fd6..dfd633b656c92dd48da454b328aa1319976565f8 100755 (executable)
--- a/testprogs/blackbox/test_wbinfo.sh
+++ b/source/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/source/selftest/samba4_tests.sh b/source/selftest/samba4_tests.sh
index 79ebc7b0f73bbed2ce010a804254c45690381210..e67e035c319f4b6ce87bab40d6edc7d917e71c94 100755 (executable)
--- a/source/selftest/samba4_tests.sh
+++ b/source/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