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: Move torture/ blackbox tests closer to code they're testing.

---
 source4/selftest/samba4_tests.sh       |  6 +++---
 source4/torture/tests/test_gentest.sh  | 34 ++++++++++++++++++++++++++++++++++
 source4/torture/tests/test_locktest.sh | 28 ++++++++++++++++++++++++++++
 source4/torture/tests/test_masktest.sh | 28 ++++++++++++++++++++++++++++
 testprogs/blackbox/test_gentest.sh     | 34 ----------------------------------
 testprogs/blackbox/test_locktest.sh    | 28 ----------------------------
 testprogs/blackbox/test_masktest.sh    | 28 ----------------------------
 7 files changed, 93 insertions(+), 93 deletions(-)
 create mode 100755 source4/torture/tests/test_gentest.sh
 create mode 100755 source4/torture/tests/test_locktest.sh
 create mode 100755 source4/torture/tests/test_masktest.sh
 delete mode 100755 testprogs/blackbox/test_gentest.sh
 delete mode 100755 testprogs/blackbox/test_locktest.sh
 delete mode 100755 testprogs/blackbox/test_masktest.sh

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/source4/torture/tests/test_gentest.sh b/source4/torture/tests/test_gentest.sh
new file mode 100755
index 0000000000..046f280f7d
--- /dev/null
+++ b/source4/torture/tests/test_gentest.sh
@@ -0,0 +1,34 @@
+#!/bin/sh
+# Blackbox tests for gentest
+# Copyright (C) 2008 Andrew Tridgell
+# based on test_smbclient.sh
+
+if [ $# -lt 4 ]; then
+cat <<EOF
+Usage: test_gentest.sh SERVER USERNAME PASSWORD DOMAIN
+EOF
+exit 1;
+fi
+
+SERVER=$1
+USERNAME=$2
+PASSWORD=$3
+DOMAIN=$4
+shift 4
+failed=0
+
+samba4bindir=`dirname $0`/../../source4/bin
+gentest=$samba4bindir/gentest
+
+. `dirname $0`/subunit.sh
+
+cat <<EOF > st/gentest.ignore
+all_info.out.fname
+internal_information.out.file_id
+EOF
+
+testit "gentest" $VALGRIND $gentest //$SERVER/test1 //$SERVER/test2 --num-ops=100 --ignore=st/gentest.ignore -W "$DOMAIN" -U"$USERNAME%$PASSWORD" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
+
+/bin/rm -f st/gentest.ignore
+
+exit $failed
diff --git a/source4/torture/tests/test_locktest.sh b/source4/torture/tests/test_locktest.sh
new file mode 100755
index 0000000000..9cad4dafa2
--- /dev/null
+++ b/source4/torture/tests/test_locktest.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+# Blackbox tests for locktest
+# Copyright (C) 2008 Andrew Tridgell
+# based on test_smbclient.sh
+
+if [ $# -lt 5 ]; then
+cat <<EOF
+Usage: test_locktest.sh SERVER USERNAME PASSWORD DOMAIN PREFIX
+EOF
+exit 1;
+fi
+
+SERVER=$1
+USERNAME=$2
+PASSWORD=$3
+DOMAIN=$4
+PREFIX=$5
+shift 5
+failed=0
+
+samba4bindir=`dirname $0`/../../source4/bin
+locktest=$samba4bindir/locktest
+
+. `dirname $0`/subunit.sh
+
+testit "locktest" $VALGRIND $locktest //$SERVER/test1 //$SERVER/test2 --num-ops=100  -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
+
+exit $failed
diff --git a/source4/torture/tests/test_masktest.sh b/source4/torture/tests/test_masktest.sh
new file mode 100755
index 0000000000..440966261f
--- /dev/null
+++ b/source4/torture/tests/test_masktest.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+# Blackbox tests for masktest
+# Copyright (C) 2008 Andrew Tridgell
+# based on test_smbclient.sh
+
+if [ $# -lt 5 ]; then
+cat <<EOF
+Usage: test_masktest.sh SERVER USERNAME PASSWORD DOMAIN PREFIX
+EOF
+exit 1;
+fi
+
+SERVER=$1
+USERNAME=$2
+PASSWORD=$3
+DOMAIN=$4
+PREFIX=$5
+shift 5
+failed=0
+
+samba4bindir=`dirname $0`/../../source4/bin
+masktest=$samba4bindir/masktest
+
+. `dirname $0`/subunit.sh
+
+testit "masktest" $VALGRIND $masktest //$SERVER/tmp --num-ops=200 --dieonerror -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
+
+exit $failed
diff --git a/testprogs/blackbox/test_gentest.sh b/testprogs/blackbox/test_gentest.sh
deleted file mode 100755
index 046f280f7d..0000000000
--- a/testprogs/blackbox/test_gentest.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-# Blackbox tests for gentest
-# Copyright (C) 2008 Andrew Tridgell
-# based on test_smbclient.sh
-
-if [ $# -lt 4 ]; then
-cat <<EOF
-Usage: test_gentest.sh SERVER USERNAME PASSWORD DOMAIN
-EOF
-exit 1;
-fi
-
-SERVER=$1
-USERNAME=$2
-PASSWORD=$3
-DOMAIN=$4
-shift 4
-failed=0
-
-samba4bindir=`dirname $0`/../../source4/bin
-gentest=$samba4bindir/gentest
-
-. `dirname $0`/subunit.sh
-
-cat <<EOF > st/gentest.ignore
-all_info.out.fname
-internal_information.out.file_id
-EOF
-
-testit "gentest" $VALGRIND $gentest //$SERVER/test1 //$SERVER/test2 --num-ops=100 --ignore=st/gentest.ignore -W "$DOMAIN" -U"$USERNAME%$PASSWORD" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
-
-/bin/rm -f st/gentest.ignore
-
-exit $failed
diff --git a/testprogs/blackbox/test_locktest.sh b/testprogs/blackbox/test_locktest.sh
deleted file mode 100755
index 9cad4dafa2..0000000000
--- a/testprogs/blackbox/test_locktest.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-# Blackbox tests for locktest
-# Copyright (C) 2008 Andrew Tridgell
-# based on test_smbclient.sh
-
-if [ $# -lt 5 ]; then
-cat <<EOF
-Usage: test_locktest.sh SERVER USERNAME PASSWORD DOMAIN PREFIX
-EOF
-exit 1;
-fi
-
-SERVER=$1
-USERNAME=$2
-PASSWORD=$3
-DOMAIN=$4
-PREFIX=$5
-shift 5
-failed=0
-
-samba4bindir=`dirname $0`/../../source4/bin
-locktest=$samba4bindir/locktest
-
-. `dirname $0`/subunit.sh
-
-testit "locktest" $VALGRIND $locktest //$SERVER/test1 //$SERVER/test2 --num-ops=100  -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
-
-exit $failed
diff --git a/testprogs/blackbox/test_masktest.sh b/testprogs/blackbox/test_masktest.sh
deleted file mode 100755
index 440966261f..0000000000
--- a/testprogs/blackbox/test_masktest.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-# Blackbox tests for masktest
-# Copyright (C) 2008 Andrew Tridgell
-# based on test_smbclient.sh
-
-if [ $# -lt 5 ]; then
-cat <<EOF
-Usage: test_masktest.sh SERVER USERNAME PASSWORD DOMAIN PREFIX
-EOF
-exit 1;
-fi
-
-SERVER=$1
-USERNAME=$2
-PASSWORD=$3
-DOMAIN=$4
-PREFIX=$5
-shift 5
-failed=0
-
-samba4bindir=`dirname $0`/../../source4/bin
-masktest=$samba4bindir/masktest
-
-. `dirname $0`/subunit.sh
-
-testit "masktest" $VALGRIND $masktest //$SERVER/tmp --num-ops=200 --dieonerror -W "$DOMAIN" -U"$USERNAME%$PASSWORD" $@ || failed=`expr $failed + 1`
-
-exit $failed
-- 
cgit