svn commit: samba r12806 - in branches/SAMBA_4_0/source/script/tests: .

[metze at samba.org]

Author: metze
Date: 2006-01-09 22:28:26 +0000 (Mon, 09 Jan 2006)
New Revision: 12806

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12806

Log:
tridge: in revision 12634 you introduced to validate the ndr_print output
and RPC-ECHO doesn't pass under valgrind anymore with this

metze
Modified:
   branches/SAMBA_4_0/source/script/tests/test_rpc_quick.sh


Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/test_rpc_quick.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_rpc_quick.sh	2006-01-09 22:19:51 UTC (rev 12805)
+++ branches/SAMBA_4_0/source/script/tests/test_rpc_quick.sh	2006-01-09 22:28:26 UTC (rev 12806)
@@ -2,10 +2,17 @@
 
 # add tests to this list as they start passing, so we test
 # that they stay passing
-ncacn_np_tests="RPC-ECHO RPC-ALTERCONTEXT RPC-JOIN"
-ncalrpc_tests="RPC-ECHO RPC-ALTERCONTEXT RPC-JOIN"
-ncacn_ip_tcp_tests="RPC-ECHO RPC-ALTERCONTEXT RPC-JOIN"
+ncacn_np_tests="RPC-ALTERCONTEXT RPC-JOIN"
+ncalrpc_tests="RPC-ALTERCONTEXT RPC-JOIN"
+ncacn_ip_tcp_tests="RPC-ALTERCONTEXT RPC-JOIN"
 
+# if we're not running under valgrind test some more tests
+if [ -z "$VALGRIND" ]; then
+	ncacn_np_tests="$ncacn_np_tests RPC-ECHO"
+	ncalrpc_tests="$ncalrpc_tests RPC-ECHO"
+	ncacn_ip_tcp_tests="$ncacn_ip_tcp_tests RPC-ECHO"
+fi
+
 if [ $# -lt 4 ]; then
 cat <<EOF
 Usage: test_rpc_quick.sh SERVER USERNAME PASSWORD DOMAIN
@@ -25,11 +32,11 @@
 failed=0
 for bindoptions in seal,validate,padcheck bigendian; do
  for transport in ncalrpc ncacn_np ncacn_ip_tcp; do
-     case $transport in
+   case $transport in
 	 ncalrpc) tests=$ncalrpc_tests ;;
 	 ncacn_np) tests=$ncacn_np_tests ;;
 	 ncacn_ip_tcp) tests=$ncacn_ip_tcp_tests ;;
-     esac
+   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`