r12806: tridge: in revision 12634 you introduced to validate the ndr_print output

and RPC-ECHO doesn't pass under valgrind anymore with this

metze
(This used to be commit 2482bf969d5b903a01ace8fa9237dd440b98196c)

diff --git a/source4/script/tests/test_rpc_quick.sh b/source4/script/tests/test_rpc_quick.sh
index 4ff6df0211ac99994af5a85f852f3a3ad8e02d71..63ff419b9949fbf54c64ee6838227d468059d7ea 100755 (executable)
--- a/source4/script/tests/test_rpc_quick.sh
+++ b/source4/script/tests/test_rpc_quick.sh
@@ -2,9 +2,16 @@
 
 # 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
@@ -25,11 +32,11 @@ incdir=`dirname $0`
 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`