From d7a0c26af47507910ab8b9363b6c6f2e2815b3d3 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 16 Sep 2008 18:30:24 +0200
Subject: [PATCH] Move torture/ blackbox tests closer to code they're testing.

---
 source4/selftest/samba4_tests.sh                            | 6 +++---
 .../blackbox => source4/torture/tests}/test_gentest.sh      | 0
 .../blackbox => source4/torture/tests}/test_locktest.sh     | 0
 .../blackbox => source4/torture/tests}/test_masktest.sh     | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename {testprogs/blackbox => source4/torture/tests}/test_gentest.sh (100%)
 rename {testprogs/blackbox => source4/torture/tests}/test_locktest.sh (100%)
 rename {testprogs/blackbox => source4/torture/tests}/test_masktest.sh (100%)

diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh
index 3c292d3855d..f89b9e0ea64 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
similarity index 100%
rename from testprogs/blackbox/test_gentest.sh
rename to source4/torture/tests/test_gentest.sh
diff --git a/testprogs/blackbox/test_locktest.sh b/source4/torture/tests/test_locktest.sh
similarity index 100%
rename from testprogs/blackbox/test_locktest.sh
rename to source4/torture/tests/test_locktest.sh
diff --git a/testprogs/blackbox/test_masktest.sh b/source4/torture/tests/test_masktest.sh
similarity index 100%
rename from testprogs/blackbox/test_masktest.sh
rename to source4/torture/tests/test_masktest.sh
-- 
2.34.1