summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsource4/selftest/samba4_tests.sh6
-rwxr-xr-xsource4/torture/tests/test_gentest.sh (renamed from testprogs/blackbox/test_gentest.sh)0
-rwxr-xr-xsource4/torture/tests/test_locktest.sh (renamed from testprogs/blackbox/test_locktest.sh)0
-rwxr-xr-xsource4/torture/tests/test_masktest.sh (renamed from testprogs/blackbox/test_masktest.sh)0
4 files changed, 3 insertions, 3 deletions
diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh
index 3c292d3855..f89b9e0ea6 100755
--- a/source4/selftest/samba4_tests.sh
+++ b/source4/selftest/samba4_tests.sh
@@ -273,9 +273,9 @@ plantest "blackbox.kinit" dc $bbdir/test_kinit.sh "\$SERVER" "\$USERNAME" "\$PAS
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.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.wintest" none $bbdir/test_wintest.sh "$TORTURE_OPTIONS"
diff --git a/testprogs/blackbox/test_gentest.sh b/source4/torture/tests/test_gentest.sh
index 046f280f7d..046f280f7d 100755
--- a/testprogs/blackbox/test_gentest.sh
+++ b/source4/torture/tests/test_gentest.sh
diff --git a/testprogs/blackbox/test_locktest.sh b/source4/torture/tests/test_locktest.sh
index 9cad4dafa2..9cad4dafa2 100755
--- a/testprogs/blackbox/test_locktest.sh
+++ b/source4/torture/tests/test_locktest.sh
diff --git a/testprogs/blackbox/test_masktest.sh b/source4/torture/tests/test_masktest.sh
index 440966261f..440966261f 100755
--- a/testprogs/blackbox/test_masktest.sh
+++ b/source4/torture/tests/test_masktest.sh