r8498: more test suite speedups. It's down to 5 minutes on my box now

[jra/samba/.git] / source4 / script / tests / test_rpc.sh

diff --git a/source4/script/tests/test_rpc.sh b/source4/script/tests/test_rpc.sh
index d7272b0e6e28c75f6fe3aac10b6ad387bb2d4bda..7ea1fbb0b34502cfaaff761f193b74ae07686ed1 100755 (executable)
--- a/source4/script/tests/test_rpc.sh
+++ b/source4/script/tests/test_rpc.sh
@@ -5,6 +5,9 @@
 ncacn_np_tests="RPC-SPOOLSS RPC-SCHANNEL RPC-ECHO RPC-DSSETUP RPC-ALTERCONTEXT RPC-MULTIBIND"
 ncalrpc_tests="RPC-SCHANNEL RPC-ECHO RPC-DSSETUP RPC-ALTERCONTEXT RPC-MULTIBIND"
 ncacn_ip_tcp_tests="RPC-SCHANNEL RPC-ECHO RPC-DSSETUP RPC-ALTERCONTEXT RPC-MULTIBIND"
+slow_ncacn_np_tests="RPC-SAMLOGON"
+slow_ncalrpc_tests="RPC-SAMLOGON"
+slow_ncacn_ip_tcp_tests="RPC-SAMLOGON"
 
 if [ $# -lt 4 ]; then
 cat <<EOF
@@ -13,10 +16,6 @@ EOF
 exit 1;
 fi
 
-if [ -z "$VALGRIND" ]; then
-    export MALLOC_CHECK_=2
-fi
-
 server="$1"
 username="$2"
 password="$3"
@@ -27,7 +26,7 @@ incdir=`dirname $0`
 . $incdir/test_functions.sh
 
 failed=0
-for bindoptions in connect sign seal sign,seal spnego spnego,sign spnego,seal validate padcheck bigendian bigendian,seal; do
+for bindoptions in seal,validate,padcheck bigendian; do
  for transport in ncalrpc ncacn_np ncacn_ip_tcp; do
      case $transport in
         ncalrpc) tests=$ncalrpc_tests ;;
@@ -42,3 +41,18 @@ for bindoptions in connect sign seal sign,seal spnego spnego,sign spnego,seal va
 done
 
 testok $0 $failed
+
+#for bindoptions in connect validate padcheck bigendian bigendian,seal; do
+# for transport in ncalrpc ncacn_np ncacn_ip_tcp; do
+#     case $transport in
+#       ncalrpc) tests=$slow_ncalrpc_tests ;;
+#       ncacn_np) tests=$slow_ncacn_np_tests ;;
+#       ncacn_ip_tcp) tests=$slow_ncacn_ip_tcp_tests ;;
+#     esac
+#   for t in $tests; do
+#    name="$t on $transport with $bindoptions"
+#    testit "$name" $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*" || failed=`expr $failed + 1`
+#   done
+# done
+#done
+