X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=source%2Fscript%2Ftests%2Ftest_w2k3.sh;h=7d52e0a09c0127d4ff679b494173d3d1c87a0e36;hb=5531eb852c1e1779c5621a4955d074d5878fc67f;hp=a05bfb28b0318cb10c9726b71a25ed1a5a17fdba;hpb=279e4de307b02bec5b64de765fbbb82c0ffdc5e4;p=samba.git

diff --git a/source/script/tests/test_w2k3.sh b/source/script/tests/test_w2k3.sh
index a05bfb28b03..7d52e0a09c0 100755
--- a/source/script/tests/test_w2k3.sh
+++ b/source/script/tests/test_w2k3.sh
@@ -4,26 +4,31 @@
 
 # add tests to this list as they start passing, so we test
 # that they stay passing
-ncacn_np_tests="RPC-DSSETUP RPC-EPMAPPER RPC-SAMR RPC-WKSSVC RPC-SRVSVC RPC-EVENTLOG RPC-NETLOGON RPC-LSA RPC-SAMLOGON RPC-SAMSYNC RPC-MULTIBIND"
-ncacn_ip_tcp_tests="RPC-EPMAPPER RPC-SAMR RPC-NETLOGON RPC-LSA RPC-SAMLOGON RPC-SAMSYNC RPC-MULTIBIND"
+ncacn_np_tests="RPC-SCHANNEL RPC-DSSETUP RPC-EPMAPPER RPC-SAMR RPC-WKSSVC RPC-SRVSVC RPC-EVENTLOG RPC-NETLOGON RPC-LSA RPC-SAMLOGON RPC-SAMSYNC RPC-MULTIBIND RPC-WINREG"
+ncacn_ip_tcp_tests="RPC-SCHANNEL RPC-EPMAPPER RPC-SAMR RPC-NETLOGON RPC-LSA RPC-SAMLOGON RPC-SAMSYNC RPC-MULTIBIND"
 
 if [ $# -lt 4 ]; then
 cat <<EOF
-Usage: test_w2k3.sh SERVER USERNAME PASSWORD DOMAIN
+Usage: test_w2k3.sh SERVER USERNAME PASSWORD DOMAIN REALM
 EOF
 exit 1;
 fi
 
+if [ -z "$VALGRIND" ]; then
+    export MALLOC_CHECK_=2
+fi
+
 server="$1"
 username="$2"
 password="$3"
 domain="$4"
-shift 4
+realm="$5"
+shift 5
 
 testit() {
    trap "rm -f test.$$" EXIT
    cmdline="$*"
-   if ! $cmdline > test.$$ 2>&1; then
+   if ! $VALGRIND $cmdline > test.$$ 2>&1; then
        cat test.$$;
        rm -f test.$$;
        echo "TEST FAILED - $cmdline";
@@ -32,22 +37,27 @@ testit() {
    rm -f test.$$;
 }
 
-for transport in ncacn_ip_tcp ncacn_np; do
- for bindoptions in padcheck connect sign seal spnego,sign spnego,seal validate bigendian; do
+OPTIONS="-U$username%$password -W $domain --option realm=$realm"
+
+echo Testing RPC-SPOOLSS on ncacn_np
+testit bin/smbtorture ncacn_np:"$server" $OPTIONS RPC-SPOOLSS "$*"
+
+for bindoptions in padcheck connect sign seal spnego,sign spnego,seal validate bigendian; do
+   for transport in ncacn_ip_tcp ncacn_np; do
      case $transport in
 	 ncacn_np) tests=$ncacn_np_tests ;;
 	 ncacn_ip_tcp) tests=$ncacn_ip_tcp_tests ;;
      esac
    for t in $tests; do
     echo Testing $t on $transport with $bindoptions
-    testit bin/smbtorture $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*"
+    testit bin/smbtorture $transport:"$server[$bindoptions]" $OPTIONS $t "$*"
    done
  done
 done
 
 echo Testing RPC-DRSUAPI on ncacn_ip_tcp with seal
-testit bin/smbtorture ncacn_ip_tcp:"$server[seal]" -U"$username"%"$password" -W $domain RPC-DRSUAPI "$*"
+testit bin/smbtorture ncacn_ip_tcp:"$server[seal]" $OPTIONS RPC-DRSUAPI "$*"
 echo Testing RPC-DRSUAPI on ncacn_ip_tcp with seal,bigendian
-testit bin/smbtorture ncacn_ip_tcp:"$server[seal,bigendian]" -U"$username"%"$password" -W $domain RPC-DRSUAPI "$*"
+testit bin/smbtorture ncacn_ip_tcp:"$server[seal,bigendian]" $OPTIONS RPC-DRSUAPI "$*"
 
 echo "ALL OK";