From b28810ab9469be0c445123149931386867c9e6b8 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 24 Oct 2007 19:16:10 +0200
Subject: [PATCH] r25722: Start merging the various test plan files for Samba 4
 into one, so that it'll

be easier to split selftest/ into a generic, a Samba 3 and a Samba 4-specific
bit.
(This used to be commit 5deb3a6fab6d1b4197b8a019ad5602055b50f9d3)
---
 source4/selftest/test_blackbox.sh | 25 --------
 source4/selftest/test_cifs.sh     | 17 ------
 source4/selftest/test_local.sh    | 10 ----
 source4/selftest/test_member.sh   | 11 ----
 source4/selftest/test_net.sh      | 12 ----
 source4/selftest/test_pidl.sh     | 18 ------
 source4/selftest/test_posix.sh    | 18 ------
 source4/selftest/test_simple.sh   | 13 -----
 source4/selftest/tests_all.sh     | 95 +++++++++++++++++++++++++++----
 9 files changed, 85 insertions(+), 134 deletions(-)
 delete mode 100755 source4/selftest/test_blackbox.sh
 delete mode 100755 source4/selftest/test_cifs.sh
 delete mode 100755 source4/selftest/test_local.sh
 delete mode 100755 source4/selftest/test_member.sh
 delete mode 100755 source4/selftest/test_net.sh
 delete mode 100755 source4/selftest/test_pidl.sh
 delete mode 100755 source4/selftest/test_posix.sh
 delete mode 100755 source4/selftest/test_simple.sh

diff --git a/source4/selftest/test_blackbox.sh b/source4/selftest/test_blackbox.sh
deleted file mode 100755
index e8f01f2fae8..00000000000
--- a/source4/selftest/test_blackbox.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# this runs tests that interact directly with the command-line tools rather than using the API
-
-if [ $# -lt 1 ]; then
-cat <<EOF
-Usage: test_blackbox.sh PREFIX [...]
-EOF
-exit 1;
-fi
-
-PREFIX=$1
-shift 1
-ADDARGS="$*"
-
-incdir=`dirname $0`
-. $incdir/test_functions.sh
-
-bbdir=$incdir/../../testprogs/blackbox
-
-plantest "blackbox.smbclient" dc $bbdir/test_smbclient.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX" "$ADDARGS"
-plantest "blackbox.kinit" dc $bbdir/test_kinit.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$REALM" "\$DOMAIN" "$PREFIX" "$ADDARGS"
-plantest "blackbox.cifsdd" dc $bbdir/test_cifsdd.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$ADDARGS"
-plantest "blackbox.nmblookup:dc" dc $bbdir/test_nmblookup.sh "\$NETBIOSNAME" "\$NETBIOSALIAS" "\$SERVER" "\$SERVER_IP" $ADDARGS
-plantest "blackbox.nmblookup:member" member $bbdir/test_nmblookup.sh "\$NETBIOSNAME" "\$NETBIOSALIAS" "\$SERVER" "\$SERVER_IP" $ADDARGS
diff --git a/source4/selftest/test_cifs.sh b/source4/selftest/test_cifs.sh
deleted file mode 100755
index f24f8d73989..00000000000
--- a/source4/selftest/test_cifs.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-# this runs the file serving tests that are expected to pass with the
-# current posix ntvfs backend, via the ntvfs cifs proxy
-
-ADDARGS="$*"
-
-incdir=`dirname $0`
-. $incdir/test_functions.sh
-
-raw=`$samba4bindir/smbtorture --list | grep "^RAW-" | xargs`
-base=`$samba4bindir/smbtorture --list | grep "^BASE-" | xargs`
-tests="$base $raw"
-
-for t in $tests; do
-    plantest "ntvfs/cifs $t" dc $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS $ADDARGS //\$NETBIOSNAME/cifs -U"\$USERNAME"%"\$PASSWORD" $t
-done
diff --git a/source4/selftest/test_local.sh b/source4/selftest/test_local.sh
deleted file mode 100755
index 5f53b4efeda..00000000000
--- a/source4/selftest/test_local.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-incdir=`dirname $0`
-. $incdir/test_functions.sh
-
-for t in `$samba4bindir/smbtorture --list | grep "^LOCAL-" | xargs`; do
-	plantest "$t" none $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS ncalrpc: $t "$*"
-done
-
-plantest "tdb stress" none $VALGRIND $samba4bindir/tdbtorture
diff --git a/source4/selftest/test_member.sh b/source4/selftest/test_member.sh
deleted file mode 100755
index 0fdc957d53d..00000000000
--- a/source4/selftest/test_member.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-incdir=`dirname $0`
-. $incdir/test_functions.sh
-
-plantest "RPC-ECHO against member server with local creds" member $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS ncacn_np:"\$NETBIOSNAME" -U"\$NETBIOSNAME/\$USERNAME"%"\$PASSWORD" RPC-ECHO "$*"
-plantest "RPC-ECHO against member server with domain creds" member $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS ncacn_np:"\$NETBIOSNAME" -U"\$DOMAIN/\$DC_USERNAME"%"\$DC_PASSWORD" RPC-ECHO "$*"
-plantest "RPC-SAMR against member server with local creds" member $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS ncacn_np:"\$NETBIOSNAME" -U"\$NETBIOSNAME/\$USERNAME"%"\$PASSWORD" "RPC-SAMR" "$*"
-plantest "RPC-SAMR-USERS against member server with local creds" member $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS ncacn_np:"\$NETBIOSNAME" -U"\$NETBIOSNAME/\$USERNAME"%"\$PASSWORD" "RPC-SAMR-USERS" "$*"
-plantest "RPC-SAMR-PASSWORDS against member server with local creds" member $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS ncacn_np:"\$NETBIOSNAME" -U"\$NETBIOSNAME/\$USERNAME"%"\$PASSWORD" "RPC-SAMR-PASSWORDS" "$*"
-plantest "wbinfo -a against member server with domain creds" member $VALGRIND $samba4bindir/wbinfo -a "\$DOMAIN/\$DC_USERNAME"%"\$DC_PASSWORD"
diff --git a/source4/selftest/test_net.sh b/source4/selftest/test_net.sh
deleted file mode 100755
index 1721c31b026..00000000000
--- a/source4/selftest/test_net.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# add tests to this list as they start passing, so we test
-# that they stay passing
-incdir=`dirname $0`
-. $incdir/test_functions.sh
-
-tests=`$samba4bindir/smbtorture --list | grep ^NET-`
-
-for t in $tests; do
-    plantest "$t" dc $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS "\$SERVER[$VALIDATE]" -U"\$USERNAME"%"\$PASSWORD" -W "\$DOMAIN" $t "$*"
-done
diff --git a/source4/selftest/test_pidl.sh b/source4/selftest/test_pidl.sh
deleted file mode 100755
index 1c68acf053f..00000000000
--- a/source4/selftest/test_pidl.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-if [ ! -n "$PERL" ]
-then
-	PERL=perl
-fi
-
-incdir=`dirname $0`
-. $incdir/test_functions.sh
-
-if test x"${PIDL_TESTS_SKIP}" = x"yes"; then
-   echo "Skipping pidl tests - PIDL_TESTS_SKIP=yes"
-elif $PERL -e 'eval require Test::More;' > /dev/null 2>&1; then
-  for f in $samba4srcdir/pidl/tests/*.pl; do
-     plantest "pidl/`basename $f`" none $PERL $f "|" $samba4srcdir/script/harness2subunit.pl
-  done
-else 
-   echo "Skipping pidl tests - Test::More not installed"
-fi
diff --git a/source4/selftest/test_posix.sh b/source4/selftest/test_posix.sh
deleted file mode 100755
index 383766cdf39..00000000000
--- a/source4/selftest/test_posix.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# this runs the file serving tests that are expected to pass with the
-# current posix ntvfs backend
-
-ADDARGS="$*"
-
-incdir=`dirname $0`
-. $incdir/test_functions.sh
-
-smb2=`$samba4bindir/smbtorture --list | grep "^SMB2-" | xargs`
-raw=`$samba4bindir/smbtorture --list | grep "^RAW-" | xargs`
-base=`$samba4bindir/smbtorture --list | grep "^BASE-" | xargs`
-tests="$base $raw $smb2"
-
-for t in $tests; do
-    plantest "$t" dc $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS $ADDARGS //\$SERVER/tmp -U"\$USERNAME"%"\$PASSWORD" $t
-done
diff --git a/source4/selftest/test_simple.sh b/source4/selftest/test_simple.sh
deleted file mode 100755
index 3532cba1804..00000000000
--- a/source4/selftest/test_simple.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# run a quick set of filesystem tests
-
-ADDARGS="$*"
-
-incdir=`dirname $0`
-. $incdir/test_functions.sh
-
-tests="BASE-RW1"
-
-for t in $tests; do
-    plantest "ntvfs/simple $t" dc $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS $ADDARGS //\$SERVER/simple -U"\$USERNAME"%"\$PASSWORD" $t
-done
diff --git a/source4/selftest/tests_all.sh b/source4/selftest/tests_all.sh
index 0db85048480..dc4305f23db 100755
--- a/source4/selftest/tests_all.sh
+++ b/source4/selftest/tests_all.sh
@@ -1,21 +1,96 @@
 #!/bin/sh
-includedir=`dirname $0`
-$includedir/../bin/smbtorture -V
+if [ ! -n "$PERL" ]
+then
+	PERL=perl
+fi
+
+incdir=`dirname $0`
+. $incdir/test_functions.sh
+
+$incdir/../bin/smbtorture -V
+
 $SRCDIR/selftest/test_ejs.sh $CONFIGURATION
 $SRCDIR/selftest/test_ldap.sh 
 $SRCDIR/selftest/test_nbt.sh "dc"
 $SRCDIR/selftest/test_winbind.sh "dc"
 $SRCDIR/selftest/test_rpc.sh
-$SRCDIR/selftest/test_net.sh
+
+# Tests for the NET API
+
+net=`$samba4bindir/smbtorture --list | grep ^NET-`
+
+for t in $net; do
+    plantest "$t" dc $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS "\$SERVER[$VALIDATE]" -U"\$USERNAME"%"\$PASSWORD" -W "\$DOMAIN" $t "$*"
+done
+
 $SRCDIR/selftest/test_session_key.sh
 $SRCDIR/selftest/test_echo.sh
-$SRCDIR/selftest/test_posix.sh
-$SRCDIR/selftest/test_cifs.sh
-$SRCDIR/selftest/test_local.sh
-$SRCDIR/selftest/test_pidl.sh
-$SRCDIR/selftest/test_blackbox.sh $PREFIX
-$SRCDIR/selftest/test_simple.sh
+
+# Tests against the NTVFS POSIX backend
+smb2=`$samba4bindir/smbtorture --list | grep "^SMB2-" | xargs`
+raw=`$samba4bindir/smbtorture --list | grep "^RAW-" | xargs`
+base=`$samba4bindir/smbtorture --list | grep "^BASE-" | xargs`
+
+for t in $base $raw $smb2; do
+    plantest "$t" dc $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS $ADDARGS //\$SERVER/tmp -U"\$USERNAME"%"\$PASSWORD" $t
+done
+
+# Tests against the NTVFS CIFS backend
+for t in $base $raw; do
+    plantest "ntvfs/cifs $t" dc $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS //\$NETBIOSNAME/cifs -U"\$USERNAME"%"\$PASSWORD" $t
+done
+
+# Local tests
+
+for t in `$samba4bindir/smbtorture --list | grep "^LOCAL-" | xargs`; do
+	plantest "$t" none $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS ncalrpc: $t "$*"
+done
+
+if test -f $samba4bindir/tdbtorture
+then
+	plantest "tdb stress" none $VALGRIND $samba4bindir/tdbtorture
+fi
+
+# Pidl tests
+
+if test x"${PIDL_TESTS_SKIP}" = x"yes"; then
+   echo "Skipping pidl tests - PIDL_TESTS_SKIP=yes"
+elif $PERL -e 'eval require Test::More;' > /dev/null 2>&1; then
+  for f in $samba4srcdir/pidl/tests/*.pl; do
+     plantest "pidl/`basename $f`" none $PERL $f "|" $samba4srcdir/script/harness2subunit.pl
+  done
+else 
+   echo "Skipping pidl tests - Test::More not installed"
+fi
+
+# Blackbox Tests:
+# tests that interact directly with the command-line tools rather than using 
+# the API
+
+bbdir=$incdir/../../testprogs/blackbox
+
+plantest "blackbox.smbclient" dc $bbdir/test_smbclient.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX" 
+plantest "blackbox.kinit" dc $bbdir/test_kinit.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$REALM" "\$DOMAIN" "$PREFIX" 
+plantest "blackbox.cifsdd" dc $bbdir/test_cifsdd.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" 
+plantest "blackbox.nmblookup:dc" dc $bbdir/test_nmblookup.sh "\$NETBIOSNAME" "\$NETBIOSALIAS" "\$SERVER" "\$SERVER_IP" 
+plantest "blackbox.nmblookup:member" member $bbdir/test_nmblookup.sh "\$NETBIOSNAME" "\$NETBIOSALIAS" "\$SERVER" "\$SERVER_IP"
+
+# Tests using the "Simple" NTVFS backend
+
+for t in "BASE-RW1"; do
+    plantest "ntvfs/simple $t" dc $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS $ADDARGS //\$SERVER/simple -U"\$USERNAME"%"\$PASSWORD" $t
+done
+
 $SRCDIR/selftest/test_s3upgrade.sh $PREFIX/upgrade
-$SRCDIR/selftest/test_member.sh
+
+# Domain Member Tests
+
+plantest "RPC-ECHO against member server with local creds" member $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS ncacn_np:"\$NETBIOSNAME" -U"\$NETBIOSNAME/\$USERNAME"%"\$PASSWORD" RPC-ECHO "$*"
+plantest "RPC-ECHO against member server with domain creds" member $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS ncacn_np:"\$NETBIOSNAME" -U"\$DOMAIN/\$DC_USERNAME"%"\$DC_PASSWORD" RPC-ECHO "$*"
+plantest "RPC-SAMR against member server with local creds" member $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS ncacn_np:"\$NETBIOSNAME" -U"\$NETBIOSNAME/\$USERNAME"%"\$PASSWORD" "RPC-SAMR" "$*"
+plantest "RPC-SAMR-USERS against member server with local creds" member $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS ncacn_np:"\$NETBIOSNAME" -U"\$NETBIOSNAME/\$USERNAME"%"\$PASSWORD" "RPC-SAMR-USERS" "$*"
+plantest "RPC-SAMR-PASSWORDS against member server with local creds" member $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS ncacn_np:"\$NETBIOSNAME" -U"\$NETBIOSNAME/\$USERNAME"%"\$PASSWORD" "RPC-SAMR-PASSWORDS" "$*"
+plantest "wbinfo -a against member server with domain creds" member $VALGRIND $samba4bindir/wbinfo -a "\$DOMAIN/\$DC_USERNAME"%"\$DC_PASSWORD"
+
 $SRCDIR/selftest/test_nbt.sh "member"
 $SRCDIR/selftest/test_winbind.sh "member"